diff --git a/.eslintrc.js b/.eslintrc.js
index 892d7cdbb1..26865d55ec 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -30,6 +30,10 @@ module.exports = {
                 ["window.innerHeight", "window.innerWidth", "window.visualViewport"],
                 "Use UIStore to access window dimensions instead.",
             ),
+            ...buildRestrictedPropertiesOptions(
+                ["React.forwardRef", "*.forwardRef", "forwardRef"],
+                "Use ref props instead.",
+            ),
             ...buildRestrictedPropertiesOptions(
                 ["*.mxcUrlToHttp", "*.getHttpUriForMxc"],
                 "Use Media helper instead to centralise access for customisation.",
@@ -55,6 +59,11 @@ module.exports = {
             "error",
             {
                 paths: [
+                    {
+                        name: "react",
+                        importNames: ["forwardRef"],
+                        message: "Use ref props instead.",
+                    },
                     {
                         name: "@testing-library/react",
                         message: "Please use jest-matrix-react instead",
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21a6b0e7ab..68b9f4e703 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,9 +43,9 @@ jobs:
             run:
                 shell: bash
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   # Disable cache on Windows as it is slower than not caching
                   # https://github.com/actions/setup-node/issues/975
@@ -77,7 +77,7 @@ jobs:
                   yarn build
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: webapp-${{ matrix.image }}
                   path: webapp
diff --git a/.github/workflows/build_debian.yaml b/.github/workflows/build_debian.yaml
index f46678512a..247e5604ee 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@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
             - 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@v4
+            - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: element-web.deb
                   path: element-web.deb
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index bbb52de5a2..9550bf9139 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@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               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@v4
+            - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: webapp
                   path: dist/develop.tar.gz
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 14fbd22086..8b52e6764c 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@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
             - name: Load GPG key
               run: |
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 1cf24facde..75a00af7aa 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -20,12 +20,12 @@ jobs:
         env:
             TEST_TAG: vectorim/element-web:test
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Install Cosign
-              uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3
+              uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3
               if: github.event_name != 'pull_request'
 
             - name: Set up QEMU
@@ -132,7 +132,7 @@ jobs:
                   cosign sign --yes ${images}
 
             - name: Update repo description
-              uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4
+              uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4
               if: github.event_name != 'pull_request'
               continue-on-error: true
               with:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index a301b6daf6..e7d69cf477 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@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   repository: element-hq/element-desktop
                   path: element-desktop
 
             - name: Fetch element-web
-              uses: actions/checkout@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   path: element-web
 
             - name: Fetch matrix-js-sdk
-              uses: actions/checkout@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   repository: matrix-org/matrix-js-sdk
                   path: matrix-js-sdk
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   cache-dependency-path: element-web/yarn.lock
@@ -47,7 +47,7 @@ jobs:
                   echo "-   [Automations](automations.md)" >> docs/SUMMARY.md
 
             - name: Setup mdBook
-              uses: peaceiris/actions-mdbook@v2
+              uses: peaceiris/actions-mdbook@ee69d230fe19748b7abf22df32acaa93833fad08 # v2
               with:
                   mdbook-version: "0.4.10"
 
@@ -88,7 +88,7 @@ jobs:
               run: mdbook build
 
             - name: Upload artifact
-              uses: actions/upload-pages-artifact@v3
+              uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
               with:
                   path: ./book
 
@@ -104,4 +104,4 @@ jobs:
         steps:
             - name: Deploy to GitHub Pages
               id: deployment
-              uses: actions/deploy-pages@v4
+              uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
diff --git a/.github/workflows/end-to-end-tests-netlify.yaml b/.github/workflows/end-to-end-tests-netlify.yaml
index e25994ec9d..90a8c3d24b 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@v4
+              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   run-id: ${{ github.event.workflow_run.id }}
@@ -33,7 +33,7 @@ jobs:
                   path: playwright-report
 
             - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
+              uses: matrix-org/netlify-pr-preview@9805cd123fc9a7e421e35340a05e1ebc5dee46b5 # v3
               with:
                   path: playwright-report
                   owner: ${{ github.event.workflow_run.head_repository.owner.login }}
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index bd7872ee12..b2d49d7703 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -50,11 +50,11 @@ jobs:
             runners-matrix: ${{ steps.runner-vars.outputs.matrix }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   repository: element-hq/element-web
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -81,7 +81,7 @@ jobs:
                   yarn build
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: webapp
                   path: webapp
@@ -89,7 +89,7 @@ jobs:
 
             - name: Calculate runner variables
               id: runner-vars
-              uses: actions/github-script@v7
+              uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               with:
                   script: |
                       const numRunners = parseInt(process.env.NUM_RUNNERS, 10);
@@ -129,18 +129,18 @@ jobs:
                     - runAllTests: false
                       project: Pinecone
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   persist-credentials: false
                   repository: element-hq/element-web
 
             - name: 📥 Download artifact
-              uses: actions/download-artifact@v4
+              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
               with:
                   name: webapp
                   path: webapp
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   cache-dependency-path: yarn.lock
@@ -154,12 +154,11 @@ 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@v4
+              uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
               id: playwright-cache
               with:
-                  path: |
-                      ~/.cache/ms-playwright
-                  key: ${{ runner.os }}-playwright-${{ steps.playwright.outputs.version }}
+                  path: ~/.cache/ms-playwright
+                  key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright.outputs.version }}
 
             - name: Install Playwright browsers
               if: steps.playwright-cache.outputs.cache-hit != 'true'
@@ -180,25 +179,35 @@ jobs:
 
             - name: Upload blob report to GitHub Actions Artifacts
               if: always()
-              uses: actions/upload-artifact@v4
+              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: all-blob-reports-${{ matrix.project }}-${{ matrix.runner }}
                   path: blob-report
                   retention-days: 1
 
+    downstream-modules:
+        name: Downstream Playwright tests [element-modules]
+        needs: build
+        if: inputs.skip != true && github.event_name == 'merge_group'
+        uses: element-hq/element-modules/.github/workflows/reusable-playwright-tests.yml@main
+        with:
+            webapp-artifact: webapp
+
     complete:
         name: end-to-end-tests
-        needs: playwright
+        needs:
+            - playwright
+            - downstream-modules
         if: always()
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               if: inputs.skip != true
               with:
                   persist-credentials: false
                   repository: element-hq/element-web
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               if: inputs.skip != true
               with:
                   cache: "yarn"
@@ -210,7 +219,7 @@ jobs:
 
             - name: Download blob reports from GitHub Actions Artifacts
               if: inputs.skip != true
-              uses: actions/download-artifact@v4
+              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
               with:
                   pattern: all-blob-reports-*
                   path: all-blob-reports
@@ -226,11 +235,11 @@ 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@v4
+              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: html-report
                   path: playwright-report
                   retention-days: 14
 
-            - if: needs.playwright.result != 'skipped' && needs.playwright.result != 'success'
+            - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
               run: exit 1
diff --git a/.github/workflows/issue_closed.yml b/.github/workflows/issue_closed.yml
index 2cffae0011..249f1eb342 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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               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 cd03ca5140..a7909265c7 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@v4
+              uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
               with:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   run-id: ${{ github.event.workflow_run.id }}
@@ -36,7 +36,7 @@ jobs:
                   path: webapp
 
             - name: 📤 Deploy to Netlify
-              uses: matrix-org/netlify-pr-preview@v3
+              uses: matrix-org/netlify-pr-preview@9805cd123fc9a7e421e35340a05e1ebc5dee46b5 # v3
               with:
                   path: webapp
                   owner: ${{ github.event.workflow_run.head_repository.owner.login }}
diff --git a/.github/workflows/pending-reviews.yaml b/.github/workflows/pending-reviews.yaml
index c96ed3f17e..199eb60daa 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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               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 7681600dde..4cbdb17bbd 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@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
             - name: Update synapse image
               run: |
diff --git a/.github/workflows/pull_request_base_branch.yaml b/.github/workflows/pull_request_base_branch.yaml
index 6610ee4879..fbdebfbed0 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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               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 031221041a..2f36644c2e 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@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               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@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               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@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               if: inputs.matrix-js-sdk
               with:
                   repository: matrix-org/matrix-js-sdk
@@ -100,7 +100,7 @@ jobs:
                   repo: matrix-org/matrix-js-sdk
                   repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   wait-interval: 10
-                  check-name: draft
+                  check-name: "draft / draft"
                   allowed-conclusions: success
 
             - name: Wait for element-web draft
@@ -111,7 +111,7 @@ jobs:
                   repo: element-hq/element-web
                   repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   wait-interval: 10
-                  check-name: draft
+                  check-name: "draft / draft"
                   allowed-conclusions: success
 
             - name: Wait for element-desktop draft
@@ -122,5 +122,5 @@ jobs:
                   repo: element-hq/element-desktop
                   repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
                   wait-interval: 10
-                  check-name: draft
+                  check-name: "draft / draft"
                   allowed-conclusions: success
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index 8b15fdfe76..d63e0da8ed 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -23,9 +23,9 @@ jobs:
         name: "Typescript Syntax Check"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -57,7 +57,7 @@ jobs:
         name: "Rethemendex Check"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
             - run: ./res/css/rethemendex.sh
 
@@ -67,9 +67,9 @@ jobs:
         name: "ESLint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -85,9 +85,9 @@ jobs:
         name: "Style Lint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -103,9 +103,9 @@ jobs:
         name: "Workflow Lint"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
@@ -121,9 +121,9 @@ jobs:
         name: "Analyse Dead Code"
         runs-on: ubuntu-24.04
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e94c35299a..276c53c098 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,12 +39,12 @@ jobs:
                 runner: [1, 2]
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
               with:
                   repository: ${{ inputs.matrix-js-sdk-sha && 'element-hq/element-web' || github.repository }}
 
             - name: Yarn cache
-              uses: actions/setup-node@v4
+              uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               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@v4
+              uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # 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@v4
+              uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
               with:
                   name: coverage-${{ matrix.runner }}
                   path: |
@@ -104,7 +104,7 @@ jobs:
 
             - name: Skip SonarCloud in merge queue
               if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
-              uses: guibranco/github-status-action-v2@fe98467f9071758c7fc214af9dbac7f301bd23d4
+              uses: guibranco/github-status-action-v2@5f2b01ce1394109f70954ae6b69ef41cf7928e63
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success
diff --git a/.github/workflows/triage-assigned.yml b/.github/workflows/triage-assigned.yml
index e43eb94618..f190122a1c 100644
--- a/.github/workflows/triage-assigned.yml
+++ b/.github/workflows/triage-assigned.yml
@@ -11,7 +11,8 @@ jobs:
         runs-on: ubuntu-24.04
         if: |
             contains(github.event.issue.assignees.*.login, 't3chguy') ||
-            contains(github.event.issue.assignees.*.login, 'andybalaam') ||
+            contains(github.event.issue.assignees.*.login, 'florianduros') ||
+            contains(github.event.issue.assignees.*.login, 'dbkr') ||
             contains(github.event.issue.assignees.*.login, 'MidhunSureshR')
         steps:
             - uses: actions/add-to-project@main
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 2cb05a8bcf..e1849e0efc 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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               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@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               with:
                   script: |
                       github.rest.issues.addLabels({
@@ -61,7 +61,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'X-Needs-Info')
         steps:
             - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
+              uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -84,7 +84,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
         steps:
             - id: add_to_project
-              uses: actions/add-to-project@v1.0.2
+              uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
               with:
                   project-url: ${{ env.PROJECT_URL }}
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -150,15 +150,15 @@ jobs:
                   project-url: https://github.com/orgs/element-hq/projects/41
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-    verticals_feature:
-        name: Add labelled issues to Verticals Feature project
+    crypto:
+        name: Add labelled issues to Crypto project
         runs-on: ubuntu-24.04
         if: >
-            contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
+            contains(github.event.issue.labels.*.name, 'Team: Crypto')
         steps:
             - uses: actions/add-to-project@main
               with:
-                  project-url: https://github.com/orgs/element-hq/projects/57
+                  project-url: https://github.com/orgs/element-hq/projects/76
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
     tech_debt:
diff --git a/.github/workflows/triage-stale.yml b/.github/workflows/triage-stale.yml
index b52f4e59da..f76cd299cc 100644
--- a/.github/workflows/triage-stale.yml
+++ b/.github/workflows/triage-stale.yml
@@ -12,7 +12,7 @@ jobs:
             issues: write
             pull-requests: write
         steps:
-            - uses: actions/stale@v9
+            - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
               with:
                   operations-per-run: 100
                   # Flaky test issue closing
diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml
index efbf80eea9..d3bda6df1f 100644
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -62,7 +62,7 @@ jobs:
             contains(github.event.issue.labels.*.name, 'A-Element-Call')) &&
             contains(github.event.issue.labels.*.name, 'Z-Labs')
         steps:
-            - uses: actions/github-script@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               with:
                   script: |
                       github.rest.issues.removeLabel({
diff --git a/.github/workflows/update-jitsi.yml b/.github/workflows/update-jitsi.yml
index f4fd13892b..da386c544d 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@v4
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-            - uses: actions/setup-node@v4
+            - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
               with:
                   cache: "yarn"
                   node-version: "lts/*"
diff --git a/.github/workflows/update-topics.yaml b/.github/workflows/update-topics.yaml
index cd6c2fc553..5ee9f2b608 100644
--- a/.github/workflows/update-topics.yaml
+++ b/.github/workflows/update-topics.yaml
@@ -22,7 +22,7 @@ jobs:
         runs-on: ubuntu-24.04
         environment: Matrix
         steps:
-            - uses: actions/github-script@v7
+            - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
               env:
                   HS_URL: ${{ secrets.BETABOT_HS_URL }}
                   LOBBY_ROOM_ID: ${{ secrets.ROOM_ID }}
diff --git a/.gitignore b/.gitignore
index 3e9dc5e135..429b317a4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ electron/pub
 .env
 /coverage
 # Auto-generated file
-/src/modules.ts
 /src/modules.js
 /build_config.yaml
 /book
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01c67c34c0..a138735650 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,148 @@
+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
+
+* New room list: add keyboard navigation support ([#29805](https://github.com/element-hq/element-web/pull/29805)). Contributed by @florianduros.
+* Use the JoinRuleSettings component for the guest link access prompt. ([#28614](https://github.com/element-hq/element-web/pull/28614)). Contributed by @toger5.
+* Add loading state to the new room list view ([#29725](https://github.com/element-hq/element-web/pull/29725)). Contributed by @langleyd.
+* Make OIDC identity reset consistent with EX ([#29854](https://github.com/element-hq/element-web/pull/29854)). Contributed by @andybalaam.
+* Support error code for email / phone adding unsupported (MSC4178) ([#29855](https://github.com/element-hq/element-web/pull/29855)). Contributed by @dbkr.
+* Update identity reset UI (Make consistent with EX) ([#29701](https://github.com/element-hq/element-web/pull/29701)). Contributed by @andybalaam.
+* Add secondary filters to the new room list ([#29818](https://github.com/element-hq/element-web/pull/29818)). Contributed by @dbkr.
+* Fix battery drain from Web Audio ([#29203](https://github.com/element-hq/element-web/pull/29203)). Contributed by @mbachry.
+
+## 🐛 Bug Fixes
+
+* Fix go home shortcut on macos and change toggle action events shortcut ([#29929](https://github.com/element-hq/element-web/pull/29929)). Contributed by @florianduros.
+* New room list: fix outdated message preview when space or filter change ([#29925](https://github.com/element-hq/element-web/pull/29925)). Contributed by @florianduros.
+* Stop migrating to MSC4278 if the config exists. ([#29924](https://github.com/element-hq/element-web/pull/29924)). Contributed by @Half-Shot.
+* Ensure consistent download file name on download from ImageView ([#29913](https://github.com/element-hq/element-web/pull/29913)). Contributed by @t3chguy.
+* Add error toast when service worker registration fails ([#29895](https://github.com/element-hq/element-web/pull/29895)). Contributed by @t3chguy.
+* New Room List: Prevent old tombstoned rooms from appearing in the list ([#29881](https://github.com/element-hq/element-web/pull/29881)). Contributed by @MidhunSureshR.
+* Remove lag in search field ([#29885](https://github.com/element-hq/element-web/pull/29885)). Contributed by @florianduros.
+* Respect UIFeature.Voip ([#29873](https://github.com/element-hq/element-web/pull/29873)). Contributed by @langleyd.
+* Allow jumping to message search from spotlight ([#29850](https://github.com/element-hq/element-web/pull/29850)). Contributed by @t3chguy.
+
+
+Changes in [1.11.100](https://github.com/element-hq/element-web/releases/tag/v1.11.100) (2025-05-06)
+====================================================================================================
+## ✨ Features
+
+* Move rich topics out of labs / stabilise MSC3765 ([#29817](https://github.com/element-hq/element-web/pull/29817)). Contributed by @Johennes.
+* Spell out that Element Web does \*not\* work on mobile. ([#29211](https://github.com/element-hq/element-web/pull/29211)). Contributed by @ara4n.
+* Add message preview support to the new room list ([#29784](https://github.com/element-hq/element-web/pull/29784)). Contributed by @dbkr.
+* Global configuration flag for media previews ([#29582](https://github.com/element-hq/element-web/pull/29582)). Contributed by @Half-Shot.
+* New room list: add partial keyboard shortcuts support ([#29783](https://github.com/element-hq/element-web/pull/29783)). Contributed by @florianduros.
+* MVVM RoomSummaryCard Topic ([#29710](https://github.com/element-hq/element-web/pull/29710)). Contributed by @MarcWadai.
+* Warn on self change from settings > roles ([#28926](https://github.com/element-hq/element-web/pull/28926)). Contributed by @MarcWadai.
+* New room list: new visual for invitation ([#29773](https://github.com/element-hq/element-web/pull/29773)). Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+
+* Fix incorrect display of the user info display name ([#29826](https://github.com/element-hq/element-web/pull/29826)). Contributed by @langleyd.
+* RoomListStore: Remove invite rooms on decline ([#29804](https://github.com/element-hq/element-web/pull/29804)). Contributed by @MidhunSureshR.
+* Fix the buttons not being displayed with long preview text ([#29811](https://github.com/element-hq/element-web/pull/29811)). Contributed by @dbkr.
+* New room list: fix missing/incorrect notification decoration  ([#29796](https://github.com/element-hq/element-web/pull/29796)). Contributed by @florianduros.
+* New Room List: Prevent potential scroll jump/flicker when switching spaces ([#29781](https://github.com/element-hq/element-web/pull/29781)). Contributed by @MidhunSureshR.
+* New room list: fix incorrect decoration ([#29770](https://github.com/element-hq/element-web/pull/29770)). Contributed by @florianduros.
+
+
+Changes in [1.11.99](https://github.com/element-hq/element-web/releases/tag/v1.11.99) (2025-04-23)
+==================================================================================================
+No changes, just bumping the version to accommodate a new Element Desktop release
+
+Changes in [1.11.98](https://github.com/element-hq/element-web/releases/tag/v1.11.98) (2025-04-22)
+==================================================================================================
+## ✨ Features
+
+* print better errors in the search view instead of a blocking modal ([#29724](https://github.com/element-hq/element-web/pull/29724)). Contributed by @Jujure.
+* New room list: video room and video call decoration  ([#29693](https://github.com/element-hq/element-web/pull/29693)). Contributed by @florianduros.
+* Remove Secure Backup, Cross-signing and Cryptography sections in `Security & Privacy` user settings ([#29088](https://github.com/element-hq/element-web/pull/29088)). Contributed by @florianduros.
+* Allow reporting a room when rejecting an invite. ([#29570](https://github.com/element-hq/element-web/pull/29570)). Contributed by @Half-Shot.
+* RoomListViewModel: Reset primary and secondary filters on space change ([#29672](https://github.com/element-hq/element-web/pull/29672)). Contributed by @MidhunSureshR.
+* RoomListStore: Support specific sorting requirements for muted rooms ([#29665](https://github.com/element-hq/element-web/pull/29665)). Contributed by @MidhunSureshR.
+* New room list: add notification options menu ([#29639](https://github.com/element-hq/element-web/pull/29639)). Contributed by @florianduros.
+* Room List: Scroll to top of the list when active room is not in the list ([#29650](https://github.com/element-hq/element-web/pull/29650)). Contributed by @MidhunSureshR.
+
+## 🐛 Bug Fixes
+
+* Fix unwanted form submit behaviour in memberlist ([#29747](https://github.com/element-hq/element-web/pull/29747)). Contributed by @MidhunSureshR.
+* New room list: fix public room icon visibility when filter change ([#29737](https://github.com/element-hq/element-web/pull/29737)). Contributed by @florianduros.
+* Fix custom theme support for short hex \& rgba hex strings ([#29726](https://github.com/element-hq/element-web/pull/29726)). Contributed by @t3chguy.
+* New room list: minor visual fixes ([#29723](https://github.com/element-hq/element-web/pull/29723)). Contributed by @florianduros.
+* Fix getOidcCallbackUrl for Element Desktop ([#29711](https://github.com/element-hq/element-web/pull/29711)). Contributed by @t3chguy.
+* Fix some webp images improperly marked as animated ([#29713](https://github.com/element-hq/element-web/pull/29713)). Contributed by @Petersmit27.
+* Revert deletion of hydrateSession ([#29703](https://github.com/element-hq/element-web/pull/29703)). Contributed by @Jujure.
+* Fix converttoroom \& converttodm not working ([#29705](https://github.com/element-hq/element-web/pull/29705)). Contributed by @t3chguy.
+* Ensure forceCloseAllModals also closes priority/static modals ([#29706](https://github.com/element-hq/element-web/pull/29706)). Contributed by @t3chguy.
+* Continue button is disabled when uploading a recovery key file ([#29695](https://github.com/element-hq/element-web/pull/29695)). Contributed by @Giwayume.
+* Catch errors after syncing recovery ([#29691](https://github.com/element-hq/element-web/pull/29691)). Contributed by @andybalaam.
+* New room list: fix multiple visual issues ([#29673](https://github.com/element-hq/element-web/pull/29673)). Contributed by @florianduros.
+* New Room List: Fix mentions filter matching rooms with any highlight ([#29668](https://github.com/element-hq/element-web/pull/29668)). Contributed by @MidhunSureshR.
+*  Fix truncated emoji label during emoji SAS ([#29643](https://github.com/element-hq/element-web/pull/29643)). Contributed by @florianduros.
+* Remove duplicate jitsi link ([#29642](https://github.com/element-hq/element-web/pull/29642)). Contributed by @dbkr.
+
+
 Changes in [1.11.97](https://github.com/element-hq/element-web/releases/tag/v1.11.97) (2025-04-08)
 ==================================================================================================
 ## ✨ Features
diff --git a/Dockerfile b/Dockerfile
index 0258850d89..a1813cf66d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-# syntax=docker.io/docker/dockerfile:1.14-labs
+# syntax=docker.io/docker/dockerfile:1.16-labs@sha256:bb5e2b225985193779991f3256d1901a0b3e6a0b284c7bffa0972064f4a6d458
 
 # Builder
-FROM --platform=$BUILDPLATFORM node:22-bullseye AS builder
+FROM --platform=$BUILDPLATFORM node:22-bullseye@sha256:f16d8e8af67bb6361231e932b8b3e7afa040cbfed181719a450b02c3821b26c1 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
+FROM nginxinc/nginx-unprivileged:alpine-slim@sha256:2acffd86b1bdefb8fa6b48b6e9aadf75430e8ab9c43c54c515ea7df77897f987
 
 # Need root user to install packages & manipulate the usr directory
 USER root
diff --git a/README.md b/README.md
index 00f8d6d89c..0f8a721f90 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread
 1. Install the prerequisites: `yarn install`.
     - If you're using the `develop` branch, then it is recommended to set up a
       proper development environment (see [Setting up a dev
-      environment](#setting-up-a-dev-environment) below). Alternatively, you
+      environment](./developer_guide.md#setting-up-a-dev-environment) below). Alternatively, you
       can use <https://develop.element.io> - the continuous integration release of
       the develop branch.
 1. Configure the app by copying `config.sample.json` to `config.json` and
diff --git a/contribute.json b/contribute.json
deleted file mode 100644
index fdd84bd8a0..0000000000
--- a/contribute.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "Element",
-    "description": "A glossy Matrix collaboration client for the web.",
-    "repository": {
-        "url": "https://github.com/element-hq/element-web",
-        "license": "AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial"
-    },
-    "bugs": {
-        "list": "https://github.com/element-hq/element-web/issues",
-        "report": "https://github.com/element-hq/element-web/issues/new/choose"
-    },
-    "keywords": ["chat", "riot", "matrix"]
-}
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 57b017bc1c..de93ce2812 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -46,7 +46,6 @@
 - [Skinning](skinning.md)
 - [Cider editor](ciderEditor.md)
 - [Iconography](icons.md)
-- [Jitsi](jitsi.md)
 - [Local echo](local-echo-dev.md)
 - [Media](media-handling.md)
 - [Room List Store](room-list-store.md)
diff --git a/docs/labs.md b/docs/labs.md
index 7f69fca6e9..60f35dd4a4 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -101,10 +101,6 @@ Under the hood this stops Element Web from adding the `perParticipantE2EE` flag
 
 This is useful while we experiment with encryption and to make calling compatible with platforms that don't use encryption yet.
 
-## Rich text in room topics (`feature_html_topic`) [In Development]
-
-Enables rendering of MD / HTML in room topics.
-
 ## Enable the notifications panel in the room header (`feature_notifications`)
 
 Unreliable in encrypted rooms.
diff --git a/package.json b/package.json
index 06ce879b01..2245d033c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.97",
+    "version": "1.11.104",
     "description": "Element: the future of secure communication",
     "author": "New Vector Ltd.",
     "repository": {
@@ -22,8 +22,7 @@
         "LICENSE",
         "README.md",
         "AUTHORS.rst",
-        "package.json",
-        "contribute.json"
+        "package.json"
     ],
     "style": "bundle.css",
     "matrix_i18n_extra_translation_funcs": [
@@ -69,19 +68,20 @@
         "postinstall": "patch-package"
     },
     "resolutions": {
-        "@playwright/test": "1.51.1",
-        "@types/react": "18.3.18",
-        "@types/react-dom": "18.3.5",
-        "oidc-client-ts": "3.2.0",
+        "**/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",
         "jwt-decode": "4.0.0",
-        "caniuse-lite": "1.0.30001704",
-        "testcontainers": "10.21.0",
+        "caniuse-lite": "1.0.30001720",
+        "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": "^0.1.1",
+        "@element-hq/element-web-module-api": "1.0.0",
         "@fontsource/inconsolata": "^5",
         "@fontsource/inter": "^5",
         "@formatjs/intl-segmenter": "^11.5.7",
@@ -93,8 +93,8 @@
         "@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.9.0",
-        "@vector-im/matrix-wysiwyg": "2.38.2",
+        "@vector-im/compound-web": "^7.11.0",
+        "@vector-im/matrix-wysiwyg": "2.38.3",
         "@zxcvbn-ts/core": "^3.0.4",
         "@zxcvbn-ts/language-common": "^3.0.4",
         "@zxcvbn-ts/language-en": "^3.0.2",
@@ -123,14 +123,14 @@
         "jsrsasign": "^11.0.0",
         "jszip": "^3.7.0",
         "katex": "^0.16.0",
-        "linkify-react": "4.2.0",
-        "linkify-string": "4.2.0",
-        "linkifyjs": "4.2.0",
+        "linkify-react": "4.3.1",
+        "linkify-string": "4.3.1",
+        "linkifyjs": "4.3.1",
         "lodash": "^4.17.21",
         "maplibre-gl": "^5.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "37.3.0",
+        "matrix-js-sdk": "37.9.0",
         "matrix-widget-api": "^1.10.0",
         "memoize-one": "^6.0.0",
         "mime": "^4.0.4",
@@ -138,22 +138,22 @@
         "opus-recorder": "^8.0.3",
         "pako": "^2.0.3",
         "png-chunks-extract": "^1.0.0",
-        "posthog-js": "1.157.2",
+        "posthog-js": "1.248.1",
         "qrcode": "1.5.4",
         "re-resizable": "6.11.2",
-        "react": "^18.3.1",
+        "react": "^19.0.0",
         "react-beautiful-dnd": "^13.1.0",
         "react-blurhash": "^0.3.0",
-        "react-dom": "^18.3.1",
+        "react-dom": "^19.0.0",
         "react-focus-lock": "^2.5.1",
         "react-string-replace": "^1.1.1",
         "react-transition-group": "^4.4.1",
         "react-virtualized": "^9.22.5",
         "rfc4648": "^1.4.0",
         "sanitize-filename": "^1.6.3",
-        "sanitize-html": "2.14.0",
+        "sanitize-html": "2.17.0",
         "tar-js": "^0.3.0",
-        "temporal-polyfill": "^0.2.5",
+        "temporal-polyfill": "^0.3.0",
         "ua-parser-js": "^1.0.2",
         "uuid": "^11.0.0",
         "what-input": "^5.2.10"
@@ -180,13 +180,14 @@
         "@babel/preset-typescript": "^7.12.7",
         "@babel/runtime": "^7.12.5",
         "@casualbot/jest-sonar-reporter": "2.2.7",
-        "@element-hq/element-call-embedded": "0.9.0",
+        "@element-hq/element-call-embedded": "0.12.0",
         "@element-hq/element-web-playwright-common": "^1.1.5",
         "@peculiar/webcrypto": "^1.4.3",
         "@playwright/test": "^1.50.1",
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
+        "@rrweb/types": "^2.0.0-alpha.18",
         "@sentry/webpack-plugin": "^3.0.0",
-        "@stylistic/eslint-plugin": "^3.0.0",
+        "@stylistic/eslint-plugin": "^4.0.0",
         "@svgr/webpack": "^8.0.0",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.4.8",
@@ -211,11 +212,11 @@
         "@types/node-fetch": "^2.6.2",
         "@types/pako": "^2.0.0",
         "@types/qrcode": "^1.3.5",
-        "@types/react": "18.3.18",
+        "@types/react": "19.1.6",
         "@types/react-beautiful-dnd": "^13.0.0",
-        "@types/react-dom": "18.3.5",
+        "@types/react-dom": "19.1.5",
         "@types/react-transition-group": "^4.4.0",
-        "@types/sanitize-html": "2.13.0",
+        "@types/sanitize-html": "2.16.0",
         "@types/semver": "^7.5.8",
         "@types/tar-js": "^0.3.5",
         "@types/ua-parser-js": "^0.7.36",
@@ -246,7 +247,7 @@
         "eslint-plugin-react-compiler": "^19.0.0-beta-df7b47d-20241124",
         "eslint-plugin-react-hooks": "^5.0.0",
         "eslint-plugin-unicorn": "^56.0.0",
-        "express": "^4.18.2",
+        "express": "^5.0.0",
         "fake-indexeddb": "^6.0.0",
         "fetch-mock": "9.11.0",
         "fetch-mock-jest": "^1.5.1",
@@ -261,7 +262,7 @@
         "jest-raw-loader": "^1.0.1",
         "jsqr": "^1.4.0",
         "knip": "^5.36.2",
-        "lint-staged": "^15.0.2",
+        "lint-staged": "^16.0.0",
         "matrix-web-i18n": "^3.2.1",
         "mini-css-extract-plugin": "2.9.2",
         "minimist": "^1.2.6",
@@ -286,13 +287,13 @@
         "semver": "^7.5.2",
         "source-map-loader": "^5.0.0",
         "stylelint": "^16.13.0",
-        "stylelint-config-standard": "^37.0.0",
+        "stylelint-config-standard": "^38.0.0",
         "stylelint-scss": "^6.0.0",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "terser-webpack-plugin": "^5.3.9",
-        "testcontainers": "^10.20.0",
+        "testcontainers": "^11.0.0",
         "ts-node": "^10.9.1",
-        "typescript": "5.8.2",
+        "typescript": "5.8.3",
         "util": "^0.12.5",
         "web-streams-polyfill": "^4.0.0",
         "webpack": "^5.89.0",
@@ -310,5 +311,6 @@
     },
     "engines": {
         "node": ">=20.0.0"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/patches/@types+react+18.3.18.patch b/patches/@types+react+18.3.18.patch
deleted file mode 100644
index 18a1e64524..0000000000
--- a/patches/@types+react+18.3.18.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/node_modules/@types/react/index.d.ts b/node_modules/@types/react/index.d.ts
-index 6ea73ef..cb51757 100644
---- a/node_modules/@types/react/index.d.ts
-+++ b/node_modules/@types/react/index.d.ts
-@@ -151,7 +151,7 @@ declare namespace React {
-         /**
-          * The current value of the ref.
-          */
--        readonly current: T | null;
-+        current: T;
-     }
- 
-     interface DO_NOT_USE_OR_YOU_WILL_BE_FIRED_CALLBACK_REF_RETURN_VALUES {
-@@ -186,7 +186,7 @@ declare namespace React {
-      * @see {@link RefObject}
-      */
- 
--    type Ref<T> = RefCallback<T> | RefObject<T> | null;
-+    type Ref<T> = RefCallback<T> | RefObject<T | null> | null;
-     /**
-      * A legacy implementation of refs where you can pass a string to a ref prop.
-      *
-@@ -300,7 +300,7 @@ declare namespace React {
-          *
-          * @see {@link https://react.dev/learn/referencing-values-with-refs#refs-and-the-dom React Docs}
-          */
--        ref?: LegacyRef<T> | undefined;
-+        ref?: LegacyRef<T | null> | undefined;
-     }
- 
-     /**
-@@ -1234,7 +1234,7 @@ declare namespace React {
-      *
-      * @see {@link ForwardRefRenderFunction}
-      */
--    type ForwardedRef<T> = ((instance: T | null) => void) | MutableRefObject<T | null> | null;
-+    type ForwardedRef<T> = ((instance: T | null) => void) | RefObject<T | null> | null;
- 
-     /**
-      * The type of the function passed to {@link forwardRef}. This is considered different
-@@ -1565,7 +1565,7 @@ declare namespace React {
-         [propertyName: string]: any;
-     }
- 
--    function createRef<T>(): RefObject<T>;
-+    function createRef<T>(): RefObject<T | null>;
- 
-     /**
-      * The type of the component returned from {@link forwardRef}.
-@@ -1989,7 +1989,7 @@ declare namespace React {
-      * @version 16.8.0
-      * @see {@link https://react.dev/reference/react/useRef}
-      */
--    function useRef<T>(initialValue: T): MutableRefObject<T>;
-+    function useRef<T>(initialValue: T): RefObject<T>;
-     // convenience overload for refs given as a ref prop as they typically start with a null value
-     /**
-      * `useRef` returns a mutable ref object whose `.current` property is initialized to the passed argument
-@@ -2004,7 +2004,7 @@ declare namespace React {
-      * @version 16.8.0
-      * @see {@link https://react.dev/reference/react/useRef}
-      */
--    function useRef<T>(initialValue: T | null): RefObject<T>;
-+    function useRef<T>(initialValue: T | null): RefObject<T | null>;
-     // convenience overload for potentially undefined initialValue / call with 0 arguments
-     // has a default to stop it from defaulting to {} instead
-     /**
-@@ -2017,7 +2017,7 @@ declare namespace React {
-      * @version 16.8.0
-      * @see {@link https://react.dev/reference/react/useRef}
-      */
--    function useRef<T = undefined>(initialValue?: undefined): MutableRefObject<T | undefined>;
-+    function useRef<T>(initialValue: T | undefined): RefObject<T | undefined>;
-     /**
-      * The signature is identical to `useEffect`, but it fires synchronously after all DOM mutations.
-      * Use this to read layout from the DOM and synchronously re-render. Updates scheduled inside
diff --git a/patches/@types+react+19.1.4.patch b/patches/@types+react+19.1.4.patch
new file mode 100644
index 0000000000..ceba85b000
--- /dev/null
+++ b/patches/@types+react+19.1.4.patch
@@ -0,0 +1,31 @@
+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/react-blurhash+0.3.0.patch b/patches/react-blurhash+0.3.0.patch
new file mode 100644
index 0000000000..93e4b05d6e
--- /dev/null
+++ b/patches/react-blurhash+0.3.0.patch
@@ -0,0 +1,22 @@
+diff --git a/node_modules/react-blurhash/dist/index.d.ts b/node_modules/react-blurhash/dist/index.d.ts
+index 3adbd0a..32e8c13 100644
+--- a/node_modules/react-blurhash/dist/index.d.ts
++++ b/node_modules/react-blurhash/dist/index.d.ts
+@@ -19,7 +19,7 @@ declare class Blurhash extends React.PureComponent<Props$1> {
+         resolutionY: number;
+     };
+     componentDidUpdate(): void;
+-    render(): JSX.Element;
++    render(): React.JSX.Element;
+ }
+ 
+ declare type Props = React.CanvasHTMLAttributes<HTMLCanvasElement> & {
+@@ -37,7 +37,7 @@ declare class BlurhashCanvas extends React.PureComponent<Props> {
+     componentDidUpdate(): void;
+     handleRef: (canvas: HTMLCanvasElement) => void;
+     draw: () => void;
+-    render(): JSX.Element;
++    render(): React.JSX.Element;
+ }
+ 
+ export { Blurhash, BlurhashCanvas };
diff --git a/playwright/e2e/crypto/backups-mas.spec.ts b/playwright/e2e/crypto/backups-mas.spec.ts
index 6519a484e9..6a7fff6672 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,7 +41,13 @@ 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("menuitem", { name: "New room" }).click();
@@ -64,7 +76,7 @@ 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("menuitem", { name: "New room" }).click();
diff --git a/playwright/e2e/crypto/backups.spec.ts b/playwright/e2e/crypto/backups.spec.ts
deleted file mode 100644
index e0cf1cc60b..0000000000
--- a/playwright/e2e/crypto/backups.spec.ts
+++ /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 { type Page } from "@playwright/test";
-
-import { test, expect } from "../../element-web-test";
-import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { completeCreateSecretStorageDialog } from "./utils.ts";
-
-async function expectBackupVersionToBe(page: Page, version: string) {
-    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(5) td")).toHaveText(
-        version + " (Algorithm: m.megolm_backup.v1.curve25519-aes-sha2)",
-    );
-
-    await expect(page.locator(".mx_SecureBackupPanel_statusList tr:nth-child(6) td")).toHaveText(version);
-}
-
-test.describe("Backups", () => {
-    test.skip(isDendrite, "Dendrite lacks support for MSC3967 so requires additional auth here");
-    test.use({
-        displayName: "Hanako",
-    });
-
-    test(
-        "Create, delete and recreate a keys backup",
-        { tag: "@no-webkit" },
-        async ({ page, user, app }, workerInfo) => {
-            // Create a backup
-            const securityTab = await app.settings.openUserSettings("Security & Privacy");
-
-            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
-            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
-
-            const securityKey = await completeCreateSecretStorageDialog(page);
-
-            // Open the settings again
-            await app.settings.openUserSettings("Security & Privacy");
-            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
-
-            // expand the advanced section to see the active version in the reports
-            await page
-                .locator(".mx_Dialog .mx_SettingsSubsection_content details .mx_SecureBackupPanel_advanced")
-                .locator("..")
-                .click();
-
-            await expectBackupVersionToBe(page, "1");
-
-            await securityTab.getByRole("button", { name: "Delete Backup", exact: true }).click();
-            const currentDialogLocator = page.locator(".mx_Dialog");
-            await expect(currentDialogLocator.getByRole("heading", { name: "Delete Backup" })).toBeVisible();
-            // Delete it
-            await currentDialogLocator.getByTestId("dialog-primary-button").click(); // Click "Delete Backup"
-
-            // Create another
-            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
-            await expect(currentDialogLocator.getByRole("heading", { name: "Recovery Key" })).toBeVisible();
-            await currentDialogLocator.getByLabel("Recovery Key").fill(securityKey);
-            await currentDialogLocator.getByRole("button", { name: "Continue", exact: true }).click();
-
-            // Should be successful
-            await expect(currentDialogLocator.getByRole("heading", { name: "Success!" })).toBeVisible();
-            await currentDialogLocator.getByRole("button", { name: "OK", exact: true }).click();
-
-            // Open the settings again
-            await app.settings.openUserSettings("Security & Privacy");
-            await expect(securityTab.getByRole("heading", { name: "Secure Backup" })).toBeVisible();
-
-            // expand the advanced section to see the active version in the reports
-            await page
-                .locator(".mx_Dialog .mx_SettingsSubsection_content details .mx_SecureBackupPanel_advanced")
-                .locator("..")
-                .click();
-
-            await expectBackupVersionToBe(page, "2");
-
-            // ==
-            // Ensure that if you don't have the secret storage passphrase the backup won't be created
-            // ==
-
-            // First delete version 2
-            await securityTab.getByRole("button", { name: "Delete Backup", exact: true }).click();
-            await expect(currentDialogLocator.getByRole("heading", { name: "Delete Backup" })).toBeVisible();
-            // Click "Delete Backup"
-            await currentDialogLocator.getByTestId("dialog-primary-button").click();
-
-            // Try to create another
-            await securityTab.getByRole("button", { name: "Set up", exact: true }).click();
-            await expect(currentDialogLocator.getByRole("heading", { name: "Recovery Key" })).toBeVisible();
-            // But cancel the recovery key dialog, to simulate not having the secret storage passphrase
-            await currentDialogLocator.getByTestId("dialog-cancel-button").click();
-
-            await expect(currentDialogLocator.getByRole("heading", { name: "Starting backup…" })).toBeVisible();
-            // check that it failed
-            await expect(currentDialogLocator.getByText("Unable to create key backup")).toBeVisible();
-            // cancel
-            await currentDialogLocator.getByTestId("dialog-cancel-button").click();
-
-            // go back to the settings to check that no backup was created (the setup button should still be there)
-            await app.settings.openUserSettings("Security & Privacy");
-            await expect(securityTab.getByRole("button", { name: "Set up", exact: true })).toBeVisible();
-        },
-    );
-});
diff --git a/playwright/e2e/crypto/crypto.spec.ts b/playwright/e2e/crypto/crypto.spec.ts
index 6adef5be60..bad9072f0c 100644
--- a/playwright/e2e/crypto/crypto.spec.ts
+++ b/playwright/e2e/crypto/crypto.spec.ts
@@ -8,14 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import type { Page } from "@playwright/test";
 import { expect, test } from "../../element-web-test";
-import {
-    autoJoin,
-    completeCreateSecretStorageDialog,
-    copyAndContinue,
-    createSharedRoomWithUser,
-    enableKeyBackup,
-    verify,
-} from "./utils";
+import { autoJoin, createSharedRoomWithUser, enableKeyBackup, verify } from "./utils";
 import { type Bot } from "../../pages/bot";
 import { type ElementAppPage } from "../../pages/ElementAppPage";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
@@ -84,86 +77,43 @@ test.describe("Cryptography", function () {
         },
     });
 
-    for (const isDeviceVerified of [true, false]) {
-        test.describe(`setting up secure key backup should work isDeviceVerified=${isDeviceVerified}`, () => {
-            /**
-             * Verify that the `m.cross_signing.${keyType}` key is available on the account data on the server
-             * @param keyType
-             */
-            async function verifyKey(app: ElementAppPage, keyType: "master" | "self_signing" | "user_signing") {
-                const accountData: { encrypted: Record<string, Record<string, string>> } = await app.client.evaluate(
-                    (cli, keyType) => cli.getAccountDataFromServer(`m.cross_signing.${keyType}`),
-                    keyType,
-                );
-                expect(accountData.encrypted).toBeDefined();
-                const keys = Object.keys(accountData.encrypted);
-                const key = accountData.encrypted[keys[0]];
-                expect(key.ciphertext).toBeDefined();
-                expect(key.iv).toBeDefined();
-                expect(key.mac).toBeDefined();
-            }
+    /**
+     * Verify that the `m.cross_signing.${keyType}` key is available on the account data on the server
+     * @param keyType
+     */
+    async function verifyKey(app: ElementAppPage, keyType: "master" | "self_signing" | "user_signing") {
+        const accountData: { encrypted: Record<string, Record<string, string>> } = await app.client.evaluate(
+            (cli, keyType) => cli.getAccountDataFromServer(`m.cross_signing.${keyType}`),
+            keyType,
+        );
 
-            test("by recovery code", async ({ page, app, user: aliceCredentials }) => {
-                // Verified the device
-                if (isDeviceVerified) {
-                    await app.client.bootstrapCrossSigning(aliceCredentials);
-                }
-
-                await page.route("**/_matrix/client/v3/keys/signatures/upload", async (route) => {
-                    // We delay this API otherwise the `Setting up keys` may happen too quickly and cause flakiness
-                    await new Promise((resolve) => setTimeout(resolve, 500));
-                    await route.continue();
-                });
-
-                await app.settings.openUserSettings("Security & Privacy");
-                await page.getByRole("button", { name: "Set up Secure Backup" }).click();
-
-                await completeCreateSecretStorageDialog(page);
-
-                // Verify that the SSSS keys are in the account data stored in the server
-                await verifyKey(app, "master");
-                await verifyKey(app, "self_signing");
-                await verifyKey(app, "user_signing");
-            });
-
-            test("by passphrase", async ({ page, app, user: aliceCredentials }) => {
-                // Verified the device
-                if (isDeviceVerified) {
-                    await app.client.bootstrapCrossSigning(aliceCredentials);
-                }
-
-                await app.settings.openUserSettings("Security & Privacy");
-                await page.getByRole("button", { name: "Set up Secure Backup" }).click();
-
-                const dialog = page.locator(".mx_Dialog");
-                // Select passphrase option
-                await dialog.getByText("Enter a Security Phrase").click();
-                await dialog.getByRole("button", { name: "Continue" }).click();
-
-                // Fill passphrase input
-                await dialog.locator("input").fill("new passphrase for setting up a secure key backup");
-                await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
-                // Confirm passphrase
-                await dialog.locator("input").fill("new passphrase for setting up a secure key backup");
-                await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
-
-                await copyAndContinue(page);
-
-                await expect(dialog.getByText("Secure Backup successful")).toBeVisible();
-                await dialog.getByRole("button", { name: "Done" }).click();
-                await expect(dialog.getByText("Secure Backup successful")).not.toBeVisible();
-
-                // Verify that the SSSS keys are in the account data stored in the server
-                await verifyKey(app, "master");
-                await verifyKey(app, "self_signing");
-                await verifyKey(app, "user_signing");
-            });
-        });
+        expect(accountData.encrypted).toBeDefined();
+        const keys = Object.keys(accountData.encrypted);
+        const key = accountData.encrypted[keys[0]];
+        expect(key.ciphertext).toBeDefined();
+        expect(key.iv).toBeDefined();
+        expect(key.mac).toBeDefined();
     }
 
+    test("Setting up key backup by recovery key", async ({ page, app, user: aliceCredentials }) => {
+        await app.client.bootstrapCrossSigning(aliceCredentials);
+
+        await enableKeyBackup(app);
+
+        // Wait for the cross signing keys to be uploaded
+        // Waiting for "Change the recovery key" button ensure that all the secrets are uploaded and cached locally
+        const encryptionTab = await app.settings.openUserSettings("Encryption");
+        await expect(encryptionTab.getByRole("button", { name: "Change recovery key" })).toBeVisible();
+
+        // Verify that the SSSS keys are in the account data stored in the server
+        await verifyKey(app, "master");
+        await verifyKey(app, "self_signing");
+        await verifyKey(app, "user_signing");
+    });
+
     test("Can reset cross-signing keys", async ({ page, app, user: aliceCredentials }) => {
         await app.client.bootstrapCrossSigning(aliceCredentials);
-        const secretStorageKey = await enableKeyBackup(app);
+        await enableKeyBackup(app);
 
         // Fetch the current cross-signing keys
         async function fetchMasterKey() {
@@ -177,18 +127,15 @@ test.describe("Cryptography", function () {
                 return k;
             });
         }
+
         const masterKey1 = await fetchMasterKey();
 
-        // Find the "reset cross signing" button, and click it
-        await app.settings.openUserSettings("Security & Privacy");
-        await page.locator("div.mx_CrossSigningPanel_buttonRow").getByRole("button", { name: "Reset" }).click();
+        // Find "the Reset cryptographic identity" button
+        const encryptionTab = await app.settings.openUserSettings("Encryption");
+        await encryptionTab.getByRole("button", { name: "Reset cryptographic identity" }).click();
 
         // Confirm
-        await page.getByRole("button", { name: "Clear cross-signing keys" }).click();
-
-        // Enter the 4S key
-        await page.getByPlaceholder("Recovery Key").fill(secretStorageKey);
-        await page.getByRole("button", { name: "Continue" }).click();
+        await encryptionTab.getByRole("button", { name: "Continue" }).click();
 
         // Enter the password
         await page.getByPlaceholder("Password").fill(aliceCredentials.password);
@@ -198,9 +145,6 @@ test.describe("Cryptography", function () {
             const masterKey2 = await fetchMasterKey();
             expect(masterKey1).not.toEqual(masterKey2);
         }).toPass();
-
-        // The dialog should have gone away
-        await expect(page.locator(".mx_Dialog")).toHaveCount(1);
     });
 
     test(
diff --git a/playwright/e2e/crypto/dehydration.spec.ts b/playwright/e2e/crypto/dehydration.spec.ts
index 2f545b8d14..379fc36cf9 100644
--- a/playwright/e2e/crypto/dehydration.spec.ts
+++ b/playwright/e2e/crypto/dehydration.spec.ts
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { test, expect } from "../../element-web-test";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
-import { completeCreateSecretStorageDialog, createBot, logIntoElement } from "./utils.ts";
+import { createBot, logIntoElement } from "./utils.ts";
 import { type Client } from "../../pages/client.ts";
 import { type ElementAppPage } from "../../pages/ElementAppPage.ts";
 
@@ -28,21 +28,27 @@ test.describe("Dehydration", () => {
     test.skip(isDendrite, "does not yet support dehydration v2");
 
     test("Verify device and reset creates dehydrated device", async ({ page, user, credentials, app }, workerInfo) => {
-        // Verify the device by resetting the key (which will create SSSS, and dehydrated device)
+        // Verify the device by resetting the identity key, and then set up recovery (which will create SSSS, and dehydrated device)
 
         const securityTab = await app.settings.openUserSettings("Security & Privacy");
         await expect(securityTab.getByText("Offline device enabled")).not.toBeVisible();
 
         await app.closeDialog();
 
-        // Verify the device by resetting the key
+        // 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: "Continue" }).click();
-        await page.getByRole("button", { name: "Copy" }).click();
+
+        // Set up recovery
+        await page.getByRole("button", { name: "Set up recovery" }).click();
         await page.getByRole("button", { name: "Continue" }).click();
-        await page.getByRole("button", { name: "Done" }).click();
+        const recoveryKey = await page.getByTestId("recoveryKey").innerText();
+        await page.getByRole("button", { name: "Continue" }).click();
+        await page.getByRole("textbox").fill(recoveryKey);
+        await page.getByRole("button", { name: "Finish set up" }).click();
+        await page.getByRole("button", { name: "Close" }).click();
 
         await expectDehydratedDeviceEnabled(app);
 
@@ -80,7 +86,7 @@ test.describe("Dehydration", () => {
         await expectDehydratedDeviceEnabled(app);
     });
 
-    test("Reset recovery key during login re-creates dehydrated device", async ({
+    test("Reset identity during login and set up recovery re-creates dehydrated device", async ({
         page,
         homeserver,
         app,
@@ -99,16 +105,26 @@ test.describe("Dehydration", () => {
         // Log in our client
         await logIntoElement(page, credentials);
 
-        // Oh no, we forgot our recovery key
+        // 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: "Proceed with reset" }).click();
+        await expect(
+            page.getByRole("heading", { name: "Are you sure you want to reset your identity?" }),
+        ).toBeVisible();
+        await page.getByRole("button", { name: "Continue", exact: true }).click();
+        await page.getByPlaceholder("Password").fill(credentials.password);
+        await page.getByRole("button", { name: "Continue" }).click();
 
-        await completeCreateSecretStorageDialog(page, { accountPassword: credentials.password });
+        // And set up recovery
+        const settings = await app.settings.openUserSettings("Encryption");
+        await settings.getByRole("button", { name: "Set up recovery" }).click();
+        await settings.getByRole("button", { name: "Continue" }).click();
+        const recoveryKey = await settings.getByTestId("recoveryKey").innerText();
+        await settings.getByRole("button", { name: "Continue" }).click();
+        await settings.getByRole("textbox").fill(recoveryKey);
+        await settings.getByRole("button", { name: "Finish set up" }).click();
 
         // There should be a brand new dehydrated device
-        const dehydratedDeviceIds = await getDehydratedDeviceIds(app.client);
-        expect(dehydratedDeviceIds.length).toBe(1);
-        expect(dehydratedDeviceIds[0]).not.toEqual(initialDehydratedDeviceIds[0]);
+        await expectDehydratedDeviceEnabled(app);
     });
 
     test("'Reset cryptographic identity' removes dehydrated device", async ({ page, homeserver, app, credentials }) => {
diff --git a/playwright/e2e/crypto/device-verification.spec.ts b/playwright/e2e/crypto/device-verification.spec.ts
index 9be79452c4..5ae53f649e 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;
@@ -163,39 +164,44 @@ test.describe("Device verification", { tag: "@no-webkit" }, () => {
 
     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("input").fill("new passphrase");
-        await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).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);
+        await enterRecoveryKeyAndCheckVerified(page, app, "new passphrase");
     });
 
     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);
+    });
+
+    /** Helper for the three tests above which verify by recovery key */
+    async function enterRecoveryKeyAndCheckVerified(page: Page, app: ElementAppPage, recoveryKey: string) {
+        await page.getByRole("button", { name: "Verify with Recovery Key or Phrase" }).click();
+
+        // Enter the recovery key
         const dialog = page.locator(".mx_Dialog");
-        await dialog.getByRole("button", { name: "use your Recovery Key" }).click();
-        const aliceRecoveryKey = await aliceBotClient.getRecoveryKey();
-        await dialog.locator("#mx_securityKey").fill(aliceRecoveryKey.encodedPrivateKey);
-        await dialog.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
+        // 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.locator("textarea").pressSequentially(recoveryKey);
+        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);
@@ -203,7 +209,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);
diff --git a/playwright/e2e/crypto/event-shields.spec.ts b/playwright/e2e/crypto/event-shields.spec.ts
index f73f190e10..e577a66467 100644
--- a/playwright/e2e/crypto/event-shields.spec.ts
+++ b/playwright/e2e/crypto/event-shields.spec.ts
@@ -67,8 +67,9 @@ test.describe("Cryptography", function () {
             // Bob has a second, not cross-signed, device
             const bobSecondDevice = await createSecondBotDevice(page, homeserver, bob);
 
-            // Dismiss the toast nagging us to set up recovery otherwise it gets in the way of clicking the room list
-            await page.getByRole("button", { name: "Not now" }).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",
diff --git a/playwright/e2e/crypto/toasts.spec.ts b/playwright/e2e/crypto/toasts.spec.ts
index 5b80f822a0..7b838edaac 100644
--- a/playwright/e2e/crypto/toasts.spec.ts
+++ b/playwright/e2e/crypto/toasts.spec.ts
@@ -8,7 +8,8 @@
 import { type GeneratedSecretStorageKey } from "matrix-js-sdk/src/crypto-api";
 
 import { test, expect } from "../../element-web-test";
-import { createBot, deleteCachedSecrets, logIntoElement } from "./utils";
+import { createBot, deleteCachedSecrets, disableKeyBackup, logIntoElement } from "./utils";
+import { type Bot } from "../../pages/bot";
 
 test.describe("Key storage out of sync toast", () => {
     let recoveryKey: GeneratedSecretStorageKey;
@@ -53,3 +54,114 @@ test.describe("Key storage out of sync toast", () => {
         ).toBeVisible();
     });
 });
+
+test.describe("'Turn on key storage' toast", () => {
+    let botClient: Bot | undefined;
+
+    test.beforeEach(async ({ page, homeserver, credentials, toasts }) => {
+        // Set up all crypto stuff. Key storage defaults to on.
+
+        const res = await createBot(page, homeserver, credentials);
+        const recoveryKey = res.recoveryKey;
+        botClient = res.botClient;
+
+        await logIntoElement(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("menuitem", { name: "New room" }).click();
+        await page.getByRole("textbox", { name: "Name" }).fill("Test room");
+        await page.getByRole("button", { name: "Create room" }).click();
+
+        await toasts.rejectToast("Notifications");
+    });
+
+    test("should not show toast if key storage is on", async ({ page, toasts }) => {
+        // Given the default situation after signing in
+        // Then no toast is shown (because key storage is on)
+        await toasts.assertNoToasts();
+
+        // When we reload
+        await page.reload();
+
+        // Give the toasts time to appear
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+
+        // Then still no toast is shown
+        await toasts.assertNoToasts();
+    });
+
+    test("should not show toast if key storage is off because we turned it off", async ({ app, page, toasts }) => {
+        // Given the backup is disabled because we disabled it
+        await disableKeyBackup(app);
+
+        // Then no toast is shown
+        await toasts.assertNoToasts();
+
+        // When we reload
+        await page.reload();
+
+        // Give the toasts time to appear
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+
+        // Then still no toast is shown
+        await toasts.assertNoToasts();
+    });
+
+    test("should show toast if key storage is off but account data is missing", async ({ app, page, toasts }) => {
+        // Given the backup is disabled but we didn't set account data saying that is expected
+        await disableKeyBackup(app);
+        await botClient.setAccountData("m.org.matrix.custom.backup_disabled", { disabled: false });
+
+        // Wait for the account data setting to stick
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+
+        // When we enter the app
+        await page.reload();
+
+        // Then the toast is displayed
+        let toast = await toasts.getToast("Turn on key storage");
+
+        // And when we click "Continue"
+        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();
+
+        // And when we close that
+        await page.getByRole("button", { name: "Close dialog" }).click();
+
+        // Then we see the toast again
+        toast = await toasts.getToast("Turn on key storage");
+
+        // And when we click "Dismiss"
+        await toast.getByRole("button", { name: "Dismiss" }).click();
+
+        // Then we see the "are you sure?" dialog
+        await expect(
+            page.getByRole("heading", { name: "Are you sure you want to keep key storage turned off?" }),
+        ).toBeVisible();
+
+        // And when we close it by clicking away
+        await page.getByTestId("dialog-background").click({ force: true, position: { x: 10, y: 10 } });
+
+        // Then we see the toast again
+        toast = await toasts.getToast("Turn on key storage");
+
+        // And when we click Dismiss and then "Go to Settings"
+        await toast.getByRole("button", { name: "Dismiss" }).click();
+        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();
+
+        // And when we close that, see the toast, click Dismiss, and Yes, Dismiss
+        await page.getByRole("button", { name: "Close dialog" }).click();
+        toast = await toasts.getToast("Turn on key storage");
+        await toast.getByRole("button", { name: "Dismiss" }).click();
+        await page.getByRole("button", { name: "Yes, dismiss" }).click();
+
+        // Then the toast is gone
+        await toasts.assertNoToasts();
+    });
+});
diff --git a/playwright/e2e/crypto/utils.ts b/playwright/e2e/crypto/utils.ts
index 77f1b747a1..289b123e86 100644
--- a/playwright/e2e/crypto/utils.ts
+++ b/playwright/e2e/crypto/utils.ts
@@ -228,8 +228,8 @@ export async function logIntoElement(page: Page, credentials: Credentials, secur
             await useSecurityKey.click();
         }
         // Fill in the recovery key
-        await page.locator(".mx_Dialog").locator('input[type="password"]').fill(securityKey);
-        await page.locator(".mx_Dialog_primary:not([disabled])", { hasText: "Continue" }).click();
+        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();
     }
 }
@@ -263,7 +263,7 @@ 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('input[type="password"]').fill(securityKey);
+    await app.page.locator(".mx_Dialog").locator("textarea").fill(securityKey);
     await app.page.getByRole("button", { name: "Continue", disabled: false }).click();
     await app.page.getByRole("button", { name: "Done" }).click();
     await app.settings.closeDialog();
@@ -316,6 +316,25 @@ export async function enableKeyBackup(app: ElementAppPage): Promise<string> {
     return recoveryKey;
 }
 
+/**
+ * Open the encryption settings and disable key storage (and recovery)
+ * Assumes that the current device has been verified
+ */
+export async function disableKeyBackup(app: ElementAppPage): Promise<void> {
+    const encryptionTab = await app.settings.openUserSettings("Encryption");
+
+    const keyStorageToggle = encryptionTab.getByRole("checkbox", { name: "Allow key storage" });
+    if (await keyStorageToggle.isChecked()) {
+        await encryptionTab.getByRole("checkbox", { name: "Allow key storage" }).click();
+        await encryptionTab.getByRole("button", { name: "Delete key storage" }).click();
+        await encryptionTab.getByRole("checkbox", { name: "Allow key storage" }).isVisible();
+
+        // Wait for the update to account data to stick
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+    }
+    await app.settings.closeDialog();
+}
+
 /**
  * Go through the "Set up Secure Backup" dialog (aka the `CreateSecretStorageDialog`).
  *
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 3ebfb22de1..d3aa060a27 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
@@ -5,8 +5,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
+import { type Visibility } from "matrix-js-sdk/src/matrix";
+import { type Locator, type Page } from "@playwright/test";
+
 import { expect, test } from "../../../element-web-test";
-import type { Page } from "@playwright/test";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
 
 test.describe("Room list filters and sort", () => {
     test.use({
@@ -18,24 +21,134 @@ test.describe("Room list filters and sort", () => {
         labsFlags: ["feature_new_room_list"],
     });
 
-    function getPrimaryFilters(page: Page) {
+    function getPrimaryFilters(page: Page): Locator {
         return page.getByRole("listbox", { name: "Room list filters" });
     }
 
+    function getRoomOptionsMenu(page: Page): Locator {
+        return page.getByRole("button", { name: "Room Options" });
+    }
+
+    /**
+     * Get the room list
+     * @param page
+     */
+    function getRoomList(page: Page) {
+        return page.getByTestId("room-list");
+    }
+
     test.beforeEach(async ({ page, app, bot, user }) => {
         // The notification toast is displayed above the search section
         await app.closeNotificationToast();
     });
 
-    test.describe("Room list", () => {
-        /**
-         * Get the room list
-         * @param page
-         */
-        function getRoomList(page: Page) {
-            return page.getByTestId("room-list");
-        }
+    test("Tombstoned rooms are not shown even when they receive updates", async ({ page, app, bot }) => {
+        // This bug shows up with this setting turned on
+        await app.settings.setValue("Spaces.allRoomsInHome", null, SettingLevel.DEVICE, true);
 
+        /*
+        We will first create a room named 'Old Room' and will invite the bot user to this room.
+        We will also send a simple message in this room.
+        */
+        const oldRoomId = await app.client.createRoom({ name: "Old Room" });
+        await app.client.inviteUser(oldRoomId, bot.credentials.userId);
+        await bot.joinRoom(oldRoomId);
+        const response = await app.client.sendMessage(oldRoomId, "Hello!");
+
+        /*
+        At this point, we haven't done anything interesting.
+        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" });
+        await expect(oldRoomTile).toBeVisible();
+
+        /*
+        Now let's tombstone 'Old Room'.
+        First we create a new room ('New Room') with the predecessor set to the old room..
+        */
+        const newRoomId = await bot.createRoom({
+            name: "New Room",
+            creation_content: {
+                predecessor: {
+                    event_id: response.event_id,
+                    room_id: oldRoomId,
+                },
+            },
+            visibility: "public" as Visibility,
+        });
+
+        /*
+        Now we can send the tombstone event itself to the 'Old Room'.
+        */
+        await app.client.sendStateEvent(oldRoomId, "m.room.tombstone", {
+            body: "This room has been replaced",
+            replacement_room: newRoomId,
+        });
+
+        // Let's join the replaced room.
+        await app.client.joinRoom(newRoomId);
+
+        // We expect 'Old Room' to be hidden from the room list.
+        await expect(oldRoomTile).not.toBeVisible();
+
+        /*
+        Let's say some user in the 'Old Room' changes their display name.
+        This will send events to the all the rooms including 'Old Room'.
+        Nevertheless, the replaced room should not be shown in the room list.
+        */
+        await bot.setDisplayName("MyNewName");
+        await expect(oldRoomTile).not.toBeVisible();
+    });
+
+    test.describe("Scroll behaviour", () => {
+        test("should scroll to the top of list when filter is applied and active room is not in filtered list", async ({
+            page,
+            app,
+        }) => {
+            const createFavouriteRoom = async (name: string) => {
+                const id = await app.client.createRoom({
+                    name,
+                });
+                await app.client.evaluate(async (client, favouriteId) => {
+                    await client.setRoomTag(favouriteId, "m.favourite", { order: 0.5 });
+                }, id);
+            };
+
+            // Create 5 favourite rooms
+            let i = 0;
+            for (; i < 5; i++) {
+                await createFavouriteRoom(`room${i}-fav`);
+            }
+
+            // Create a non-favourite room
+            await app.client.createRoom({ name: `room-non-fav` });
+
+            // Create rest of the favourite rooms
+            for (; i < 20; i++) {
+                await createFavouriteRoom(`room${i}-fav`);
+            }
+
+            // Open the non-favourite room
+            const roomListView = getRoomList(page);
+            const tile = roomListView.getByRole("gridcell", { name: "Open room room-non-fav" });
+            await tile.scrollIntoViewIfNeeded();
+            await tile.click();
+
+            // Enable Favourite filter
+            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" })
+                .evaluate((e) => e.scrollTop !== 0);
+            expect(isScrolledDown).toStrictEqual(false);
+        });
+    });
+
+    test.describe("Room list", () => {
         let unReadDmId: string | undefined;
         let unReadRoomId: string | undefined;
 
@@ -59,6 +172,38 @@ test.describe("Room list filters and sort", () => {
             await app.client.evaluate(async (client, favouriteId) => {
                 await client.setRoomTag(favouriteId, "m.favourite", { order: 0.5 });
             }, favouriteId);
+
+            const lowPrioId = await app.client.createRoom({ name: "Low prio room" });
+            await app.client.evaluate(async (client, id) => {
+                await client.setRoomTag(id, "m.lowpriority", { order: 0.5 });
+            }, lowPrioId);
+
+            await bot.createRoom({
+                name: "invited room",
+                invite: [user.userId],
+                is_direct: true,
+            });
+
+            const mentionRoomId = await app.client.createRoom({ name: "room with mention" });
+            await app.client.inviteUser(mentionRoomId, bot.credentials.userId);
+            await bot.joinRoom(mentionRoomId);
+
+            const clientBot = await bot.prepareClient();
+            await clientBot.evaluate(
+                async (client, { mentionRoomId, userId }) => {
+                    await client.sendMessage(mentionRoomId, {
+                        // @ts-ignore ignore usage of MsgType.text
+                        "msgtype": "m.text",
+                        "body": "User",
+                        "format": "org.matrix.custom.html",
+                        "formatted_body": `<a href="https://matrix.to/#/${userId}">User</a>`,
+                        "m.mentions": {
+                            user_ids: [userId],
+                        },
+                    });
+                },
+                { mentionRoomId, userId: user.userId },
+            );
         });
 
         test("should filter the list (with primary filters)", { tag: "@screenshot" }, async ({ page, app, user }) => {
@@ -75,7 +220,7 @@ test.describe("Room list filters and sort", () => {
             // 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(2);
+            expect(await roomList.locator("role=gridcell").count()).toBe(4);
             await expect(primaryFilters).toMatchScreenshot("unread-primary-filters.png");
 
             await primaryFilters.getByRole("option", { name: "Favourite" }).click();
@@ -84,37 +229,71 @@ test.describe("Room list filters and sort", () => {
 
             await primaryFilters.getByRole("option", { name: "People" }).click();
             await expect(roomList.getByRole("gridcell", { name: "unread dm" })).toBeVisible();
-            expect(await roomList.locator("role=gridcell").count()).toBe(1);
+            await expect(roomList.getByRole("gridcell", { name: "invited room" })).toBeVisible();
+            expect(await roomList.locator("role=gridcell").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();
-            expect(await roomList.locator("role=gridcell").count()).toBe(3);
+            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 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 primaryFilters.getByRole("option", { name: "Invites" }).click();
+            await expect(roomList.getByRole("gridcell", { name: "invited room" })).toBeVisible();
+            expect(await roomList.locator("role=gridcell").count()).toBe(1);
         });
 
-        test("unread filter should only match unread rooms that have a count", async ({ page, app, bot }) => {
+        test(
+            "unread filter should only match unread rooms that have a count",
+            { tag: "@screenshot" },
+            async ({ page, app, bot }) => {
+                const roomListView = getRoomList(page);
+
+                // Let's configure unread dm room so that we only get notification for mentions and keywords
+                await app.viewRoomById(unReadDmId);
+                await app.settings.openRoomSettings("Notifications");
+                await page.getByText("@mentions & keywords").click();
+                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();
+
+                // 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();
+
+                // Unread filter should only show unread room and not unread dm!
+                const unreadDm = roomListView.getByRole("gridcell", { 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();
+            },
+        );
+
+        test("should sort the room list alphabetically", async ({ page }) => {
             const roomListView = getRoomList(page);
 
-            // Let's configure unread dm room so that we only get notification for mentions and keywords
-            await app.viewRoomById(unReadDmId);
-            await app.settings.openRoomSettings("Notifications");
-            await page.getByText("@mentions & keywords").click();
-            await app.settings.closeDialog();
+            await getRoomOptionsMenu(page).click();
+            await page.getByRole("menuitemradio", { name: "A-Z" }).click();
 
-            // Let's open a room other than unread room or unread dm
-            await roomListView.getByRole("gridcell", { name: "Open room favourite room" }).click();
+            await expect(roomListView.getByRole("gridcell").first()).toHaveText(/empty room/);
+        });
+
+        test("should move room to the top on message when sorting by activity", async ({ page, bot }) => {
+            const roomListView = getRoomList(page);
 
-            // 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();
-
-            // Unread filter should only show unread room and not unread dm!
-            await expect(roomListView.getByRole("gridcell", { name: "Open room unread room" })).toBeVisible();
-            await expect(roomListView.getByRole("gridcell", { name: "Open room unread dm" })).not.toBeVisible();
+            await expect(roomListView.getByRole("gridcell").first()).toHaveText(/unread dm/);
         });
     });
 
@@ -137,15 +316,25 @@ test.describe("Room list filters and sort", () => {
             },
         );
 
-        test("should render the placeholder for unread filter", { tag: "@screenshot" }, async ({ page, app, user }) => {
-            const primaryFilters = getPrimaryFilters(page);
-            await primaryFilters.getByRole("option", { name: "Unread" }).click();
+        [
+            { filter: "Unreads", action: "Show all chats" },
+            { filter: "Mentions", action: "See all activity" },
+            { filter: "Invites", action: "See all activity" },
+        ].forEach(({ filter, action }) => {
+            test(
+                `should render the placeholder for ${filter} filter`,
+                { tag: "@screenshot" },
+                async ({ page, app, user }) => {
+                    const primaryFilters = getPrimaryFilters(page);
+                    await primaryFilters.getByRole("option", { name: filter }).click();
 
-            const emptyRoomList = getEmptyRoomList(page);
-            await expect(emptyRoomList).toMatchScreenshot("unread-empty-room-list.png");
+                    const emptyRoomList = getEmptyRoomList(page);
+                    await expect(emptyRoomList).toMatchScreenshot(`${filter}-empty-room-list.png`);
 
-            await emptyRoomList.getByRole("button", { name: "show all chats" }).click();
-            await expect(primaryFilters.getByRole("option", { name: "Unread" })).not.toBeChecked();
+                    await emptyRoomList.getByRole("button", { name: action }).click();
+                    await expect(primaryFilters.getByRole("option", { name: filter })).not.toBeChecked();
+                },
+            );
         });
 
         ["People", "Rooms", "Favourite"].forEach((filter) => {
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 2ffbc608c2..8ca138a707 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
@@ -30,6 +30,9 @@ test.describe("Room list panel", () => {
         for (let i = 0; i < 20; i++) {
             await app.client.createRoom({ name: `room${i}` });
         }
+
+        // focus the user menu to avoid to have hover decoration
+        await page.getByRole("button", { name: "User menu" }).focus();
     });
 
     test("should render the room list panel", { tag: "@screenshot" }, async ({ page, app, user }) => {
@@ -38,4 +41,10 @@ test.describe("Room list panel", () => {
         await expect(roomListView.getByRole("gridcell", { 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");
+        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 ebca899a13..73eb98512b 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
@@ -7,7 +7,7 @@
 
 import { type Page } from "@playwright/test";
 
-import { test, expect } from "../../../element-web-test";
+import { expect, test } from "../../../element-web-test";
 
 test.describe("Room list", () => {
     test.use({
@@ -29,6 +29,9 @@ test.describe("Room list", () => {
     test.beforeEach(async ({ page, app, user }) => {
         // The notification toast is displayed above the search section
         await app.closeNotificationToast();
+
+        // focus the user menu to avoid to have hover decoration
+        await page.getByRole("button", { name: "User menu" }).focus();
     });
 
     test.describe("Room list", () => {
@@ -43,7 +46,8 @@ test.describe("Room list", () => {
             await expect(roomListView.getByRole("gridcell", { name: "Open room room29" })).toBeVisible();
             await expect(roomListView).toMatchScreenshot("room-list.png");
 
-            await roomListView.hover();
+            // Put focus on the room list
+            await roomListView.getByRole("gridcell", { 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();
@@ -85,9 +89,49 @@ test.describe("Room list", () => {
             await expect(roomItem).not.toBeVisible();
         });
 
+        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" });
+            await roomItem.hover();
+
+            await expect(roomItem).toMatchScreenshot("room-list-item-hover.png");
+            let roomItemMenu = roomItem.getByRole("button", { name: "Notification options" });
+            await roomItemMenu.click();
+
+            // Default settings should be selected
+            await expect(page.getByRole("menuitem", { name: "Match default settings" })).toHaveAttribute(
+                "aria-selected",
+                "true",
+            );
+            await expect(page).toMatchScreenshot("room-list-item-open-notification-options.png");
+
+            // It should make the room muted
+            await page.getByRole("menuitem", { name: "Mute room" }).click();
+
+            // Put focus on the room list
+            await roomListView.getByRole("gridcell", { name: "Open room room28" }).click();
+            // Scroll to the end of the room list
+            await page.mouse.wheel(0, 1000);
+
+            // The room decoration should have the muted icon
+            await expect(roomItem.getByTestId("notification-decoration")).toBeVisible();
+
+            await roomItem.hover();
+            // On hover, the room should show the muted icon
+            await expect(roomItem).toMatchScreenshot("room-list-item-hover-silent.png");
+
+            roomItemMenu = roomItem.getByRole("button", { name: "Notification options" });
+            await roomItemMenu.click();
+            // The Mute room option should be selected
+            await expect(page.getByRole("menuitem", { name: "Mute room" })).toHaveAttribute("aria-selected", "true");
+            await expect(page).toMatchScreenshot("room-list-item-open-notification-options-selection.png");
+        });
+
         test("should scroll to the current room", async ({ page, app, user }) => {
             const roomListView = getRoomList(page);
-            await roomListView.hover();
+            // Put focus on the room list
+            await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
             // Scroll to the end of the room list
             await page.mouse.wheel(0, 1000);
 
@@ -100,6 +144,154 @@ test.describe("Room list", () => {
             await filters.getByRole("option", { name: "People" }).click();
             await expect(roomListView.getByRole("gridcell", { 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 page.keyboard.press("Alt+ArrowDown");
+
+                await expect(page.getByRole("heading", { name: "room28", level: 1 })).toBeVisible();
+            });
+
+            test("should select the previous room", async ({ page, app, user }) => {
+                const roomListView = getRoomList(page);
+                await roomListView.getByRole("gridcell", { name: "Open room room28" }).click();
+                await page.keyboard.press("Alt+ArrowUp");
+
+                await expect(page.getByRole("heading", { name: "room29", level: 1 })).toBeVisible();
+            });
+
+            test("should select the last room", async ({ page, app, user }) => {
+                const roomListView = getRoomList(page);
+                await roomListView.getByRole("gridcell", { name: "Open room room29" }).click();
+                await page.keyboard.press("Alt+ArrowUp");
+
+                await expect(page.getByRole("heading", { name: "room0", level: 1 })).toBeVisible();
+            });
+
+            test("should select the next unread room", async ({ page, app, user, bot }) => {
+                const roomListView = getRoomList(page);
+
+                const roomId = await app.client.createRoom({ name: "1 notification" });
+                await app.client.inviteUser(roomId, bot.credentials.userId);
+                await bot.joinRoom(roomId);
+                await bot.sendMessage(roomId, "I am a robot. Beep.");
+
+                await roomListView.getByRole("gridcell", { name: "Open room room20" }).click();
+
+                await page.keyboard.press("Alt+Shift+ArrowDown");
+
+                await expect(page.getByRole("heading", { name: "1 notification", level: 1 })).toBeVisible();
+            });
+        });
+
+        test.describe("Keyboard navigation", () => {
+            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" });
+
+                // open the room
+                await room29.click();
+                // put focus back on the room list item
+                await room29.click();
+                await expect(room29).toBeFocused();
+
+                await page.keyboard.press("ArrowDown");
+                await expect(room28).toBeFocused();
+                await expect(room29).not.toBeFocused();
+
+                await page.keyboard.press("ArrowUp");
+                await expect(room29).toBeFocused();
+                await expect(room28).not.toBeFocused();
+            });
+
+            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 moreButton = room29.getByRole("button", { name: "More options" });
+                const notificationButton = room29.getByRole("button", { name: "Notification options" });
+
+                await room29.click();
+                // put focus back on the room list item
+                await room29.click();
+                await page.keyboard.press("Tab");
+                await expect(moreButton).toBeFocused();
+                await page.keyboard.press("Tab");
+                await expect(notificationButton).toBeFocused();
+
+                // Open the menu
+                await notificationButton.click();
+                // 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("Escape");
+                // Focus should be back on the room list item
+                await expect(room29).toBeFocused();
+            });
+        });
+    });
+
+    test.describe("Avatar decoration", () => {
+        test.use({ labsFlags: ["feature_video_rooms", "feature_new_room_list"] });
+
+        test("should be a public room", { tag: "@screenshot" }, async ({ page, app, user }) => {
+            // @ts-ignore Visibility enum is not accessible
+            await app.client.createRoom({ name: "public room", visibility: "public" });
+
+            // focus the user menu to avoid to have hover decoration
+            await page.getByRole("button", { name: "User menu" }).focus();
+
+            const roomListView = getRoomList(page);
+            const publicRoom = roomListView.getByRole("gridcell", { 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("gridcell", { name: "low priority room" });
+
+            // Make room low priority
+            await publicRoom.hover();
+            const roomItemMenu = publicRoom.getByRole("button", { name: "More Options" });
+            await roomItemMenu.click();
+            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 user menu to avoid to have hover decoration
+            await page.getByRole("button", { name: "User menu" }).focus();
+            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("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" });
+
+            // focus the user menu to avoid to have hover decoration
+            await page.getByRole("button", { name: "User menu" }).focus();
+
+            await expect(videoRoom).toBeVisible();
+            await expect(videoRoom).toMatchScreenshot("room-list-item-video.png");
+        });
     });
 
     test.describe("Notification decoration", () => {
@@ -162,6 +354,27 @@ test.describe("Room list", () => {
             await expect(room).toMatchScreenshot("room-list-item-mention.png");
         });
 
+        test("should render a message preview", { tag: "@screenshot" }, async ({ page, app, user, bot }) => {
+            await app.settings.openUserSettings("Preferences");
+            await page.getByRole("switch", { name: "Show message previews" }).click();
+            await app.closeDialog();
+
+            const roomListView = getRoomList(page);
+
+            const roomId = await app.client.createRoom({ name: "activity" });
+
+            // focus the user menu to avoid to have hover decoration
+            await page.getByRole("button", { name: "User menu" }).focus();
+
+            await app.client.inviteUser(roomId, bot.credentials.userId);
+            await bot.joinRoom(roomId);
+            await bot.sendMessage(roomId, "I am a robot. Beep.");
+
+            const room = roomListView.getByRole("gridcell", { name: "activity" });
+            await expect(room.getByText("I am a robot. Beep.")).toBeVisible();
+            await expect(room).toMatchScreenshot("room-list-item-message-preview.png");
+        });
+
         test("should render an activity decoration", { tag: "@screenshot" }, async ({ page, app, user, bot }) => {
             const roomListView = getRoomList(page);
 
@@ -201,8 +414,8 @@ test.describe("Room list", () => {
             await room.getByRole("button", { name: "More Options" }).click();
             await page.getByRole("menuitem", { name: "mark as unread" }).click();
 
-            // Remove hover on the room list item
-            await roomListView.hover();
+            // focus the user menu to avoid to have hover decoration
+            await page.getByRole("button", { name: "User menu" }).focus();
 
             await expect(room).toMatchScreenshot("room-list-item-mark-as-unread.png");
         });
diff --git a/playwright/e2e/login/login-consent.spec.ts b/playwright/e2e/login/login-consent.spec.ts
index c4a4b1409f..23baf023fa 100644
--- a/playwright/e2e/login/login-consent.spec.ts
+++ b/playwright/e2e/login/login-consent.spec.ts
@@ -288,6 +288,43 @@ test.describe("Login", () => {
                     await expect(h1).toBeVisible();
                 });
             });
+
+            test("Can reset identity to become verified", async ({ page, homeserver, request, credentials }) => {
+                // Log in
+                const res = await request.post(`${homeserver.baseUrl}/_matrix/client/v3/keys/device_signing/upload`, {
+                    headers: { Authorization: `Bearer ${credentials.accessToken}` },
+                    data: DEVICE_SIGNING_KEYS_BODY,
+                });
+                if (!res.ok()) {
+                    console.log(`Uploading dummy keys failed with HTTP status ${res.status}`, await res.json());
+                    throw new Error("Uploading dummy keys failed");
+                }
+
+                await page.goto("/");
+                await login(page, homeserver, credentials);
+
+                await expect(page.getByRole("heading", { name: "Verify this device", level: 1 })).toBeVisible();
+
+                // Start the reset process
+                await page.getByRole("button", { name: "Proceed with reset" }).click();
+
+                // First try cancelling and restarting
+                await page.getByRole("button", { name: "Cancel" }).click();
+                await page.getByRole("button", { name: "Proceed with reset" }).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();
+
+                // Finally we actually continue
+                await page.getByRole("button", { name: "Continue" }).click();
+                await page.getByPlaceholder("Password").fill(credentials.password);
+                await page.getByRole("button", { name: "Continue" }).click();
+
+                // We end up at the Home screen
+                await expect(page).toHaveURL(/\/#\/home$/, { timeout: 10000 });
+                await expect(page.getByRole("heading", { name: "Welcome Dave", exact: true })).toBeVisible();
+            });
         });
     });
 
diff --git a/playwright/e2e/modules/loader.spec.ts b/playwright/e2e/modules/loader.spec.ts
index e21b5c2d92..52c7a02988 100644
--- a/playwright/e2e/modules/loader.spec.ts
+++ b/playwright/e2e/modules/loader.spec.ts
@@ -15,6 +15,7 @@ test.describe("Module loading", () => {
     test.describe("Example Module", () => {
         test.use({
             config: {
+                brand: "TestBrand",
                 modules: ["/modules/example-module.js"],
             },
             page: async ({ page }, use) => {
@@ -25,11 +26,31 @@ test.describe("Module loading", () => {
             },
         });
 
-        test("should show alert", async ({ page }) => {
-            const dialogPromise = page.waitForEvent("dialog");
-            await page.goto("/");
-            const dialog = await dialogPromise;
-            expect(dialog.message()).toBe("Testing module loading successful!");
-        });
+        const testCases = [
+            ["en", "TestBrand module loading successful!"],
+            ["de", "TestBrand-Module erfolgreich geladen!"],
+        ];
+
+        for (const [lang, message] of testCases) {
+            test.describe(`language-${lang}`, () => {
+                test.use({
+                    config: async ({ config }, use) => {
+                        await use({
+                            ...config,
+                            setting_defaults: {
+                                language: lang,
+                            },
+                        });
+                    },
+                });
+
+                test("should show alert", async ({ page }) => {
+                    const dialogPromise = page.waitForEvent("dialog");
+                    await page.goto("/");
+                    const dialog = await dialogPromise;
+                    expect(dialog.message()).toBe(message);
+                });
+            });
+        }
     });
 });
diff --git a/playwright/e2e/oidc/index.ts b/playwright/e2e/oidc/index.ts
index 1989e8764f..02de6e2f03 100644
--- a/playwright/e2e/oidc/index.ts
+++ b/playwright/e2e/oidc/index.ts
@@ -37,6 +37,8 @@ export async function registerAccountMas(
 
     await page.getByRole("textbox", { name: "6-digit code" }).fill(code);
     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 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 2592311554..a6fbf231ce 100644
--- a/playwright/e2e/oidc/oidc-native.spec.ts
+++ b/playwright/e2e/oidc/oidc-native.spec.ts
@@ -33,7 +33,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 +55,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();
@@ -83,12 +83,11 @@ 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!");
 
             await expect(page.getByText("Welcome")).toBeVisible();
             await page.goto("about:blank");
 
-            // @ts-expect-error
             const result = await mas.manage("kill-sessions", userId);
             expect(result.output).toContain("Ended 1 active OAuth 2.0 session");
 
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 7486af7033..3670e64308 100644
--- a/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
+++ b/playwright/e2e/regression-tests/pills-click-in-app.spec.ts
@@ -43,6 +43,7 @@ test.describe("Pills", () => {
 
         // go back to the message room and try to click on the pill text, as a user would
         await app.viewRoomByName(messageRoom);
+        await expect(page).toHaveURL(new RegExp(`/#/room/${messageRoomId}`));
         const pillText = page.locator(".mx_EventTile_body .mx_Pill .mx_Pill_text");
         await expect(pillText).toHaveCSS("pointer-events", "none");
         await pillText.click({ force: true }); // force is to ensure we bypass pointer-events
diff --git a/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts b/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
index c2ebd5b853..812b66b796 100644
--- a/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
+++ b/playwright/e2e/release-announcement/releaseAnnouncement.spec.ts
@@ -15,20 +15,34 @@ test.describe("Release announcement", () => {
                 feature_release_announcement: true,
             },
         },
-        labsFlags: ["threadsActivityCentre"],
+        room: async ({ app, user }, use) => {
+            const roomId = await app.client.createRoom({
+                name: "Test room",
+            });
+            await app.viewRoomById(roomId);
+            await use({ roomId });
+        },
     });
 
-    test("should display the release announcement process", { tag: "@screenshot" }, async ({ page, app, util }) => {
-        // The TAC release announcement should be displayed
-        await util.assertReleaseAnnouncementIsVisible("Threads Activity Centre");
-        // Hide the release announcement
-        await util.markReleaseAnnouncementAsRead("Threads Activity Centre");
-        await util.assertReleaseAnnouncementIsNotVisible("Threads Activity Centre");
+    test(
+        "should display the pinned messages release announcement",
+        { tag: "@screenshot" },
+        async ({ page, app, room, util }) => {
+            await app.toggleRoomInfoPanel();
 
-        await page.reload();
-        // Wait for EW to load
-        await expect(page.getByRole("navigation", { name: "Spaces" })).toBeVisible();
-        // Check that once the release announcement has been marked as viewed, it does not appear again
-        await util.assertReleaseAnnouncementIsNotVisible("Threads Activity Centre");
-    });
+            const name = "All new pinned messages";
+
+            // The release announcement should be displayed
+            await util.assertReleaseAnnouncementIsVisible(name);
+            // Hide the release announcement
+            await util.markReleaseAnnouncementAsRead(name);
+            await util.assertReleaseAnnouncementIsNotVisible(name);
+
+            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);
+        },
+    );
 });
diff --git a/playwright/e2e/right-panel/right-panel.spec.ts b/playwright/e2e/right-panel/right-panel.spec.ts
index 44b051c987..0fbd306d86 100644
--- a/playwright/e2e/right-panel/right-panel.spec.ts
+++ b/playwright/e2e/right-panel/right-panel.spec.ts
@@ -11,6 +11,7 @@ import { type Locator, type Page } from "@playwright/test";
 import { test, expect } from "../../element-web-test";
 import { checkRoomSummaryCard, viewRoomSummaryByName } from "./utils";
 import { isDendrite } from "../../plugins/homeserver/dendrite";
+import { Bot } from "../../pages/bot";
 
 const ROOM_NAME = "Test room";
 const ROOM_NAME_LONG =
@@ -21,20 +22,23 @@ const ROOM_NAME_LONG =
     "officia deserunt mollit anim id est laborum.";
 const SPACE_NAME = "Test space";
 const NAME = "Alice";
+const LONG_NAME = "Bob long long long long long long long long long long long long long long long name";
+
 const ROOM_ADDRESS_LONG =
     "loremIpsumDolorSitAmetConsecteturAdipisicingElitSedDoEiusmodTemporIncididuntUtLaboreEtDoloreMagnaAliqua";
 
 function getMemberTileByName(page: Page, name: string): Locator {
-    return page.locator(`.mx_MemberTileView, [title="${name}"]`);
+    return page.locator(".mx_MemberListView .mx_MemberTileView_name").filter({ hasText: name });
 }
 
 test.describe("RightPanel", () => {
+    let testRoomId: string;
     test.use({
         displayName: NAME,
     });
 
     test.beforeEach(async ({ app, user }) => {
-        await app.client.createRoom({ name: ROOM_NAME });
+        testRoomId = await app.client.createRoom({ name: ROOM_NAME });
         await app.client.createSpace({ name: SPACE_NAME });
     });
 
@@ -77,10 +81,12 @@ test.describe("RightPanel", () => {
             await expect(page.locator(".mx_RightPanel")).toMatchScreenshot("with-leave-room.png");
         });
 
-        test("should handle clicking add widgets", async ({ page, app }) => {
+        test("should handle clicking add widgets", { tag: "@screenshot" }, async ({ page, app }) => {
             await viewRoomSummaryByName(page, app, ROOM_NAME);
 
             await page.getByRole("menuitem", { name: "Extensions" }).click();
+            await expect(page.getByTestId("right-panel")).toMatchScreenshot("with-extensions.png");
+
             await page.getByRole("button", { name: "Add extensions" }).click();
             await expect(page.locator(".mx_IntegrationManager")).toBeVisible();
         });
@@ -134,15 +140,63 @@ test.describe("RightPanel", () => {
             await page.getByLabel("Room info").nth(1).click();
             await checkRoomSummaryCard(page, ROOM_NAME);
         });
+
+        test(
+            "should handle viewing long room member name",
+            { tag: "@screenshot" },
+            async ({ page, homeserver, app }) => {
+                const bobLongName = new Bot(page, homeserver, { displayName: LONG_NAME });
+                await bobLongName.prepareClient();
+                await app.client.inviteUser(testRoomId, bobLongName.credentials.userId);
+                await bobLongName.joinRoom(testRoomId);
+
+                await viewRoomSummaryByName(page, app, ROOM_NAME);
+
+                await page.locator(".mx_RightPanel").getByRole("menuitem", { name: "People" }).click();
+                await expect(page.locator(".mx_MemberListView")).toBeVisible();
+
+                await getMemberTileByName(page, LONG_NAME).click();
+                await expect(page.locator(".mx_UserInfo")).toBeVisible();
+                await expect(page.locator(".mx_UserInfo_profile").getByText(LONG_NAME)).toBeVisible();
+
+                await expect(page.locator(".mx_UserInfo")).toMatchScreenshot("with-long-name.png", {
+                    mask: [page.locator(".mx_UserInfo_profile_mxid")],
+                    css: `
+                        /* Use monospace font for consistent mask width */
+                        .mx_UserInfo_profile_mxid {
+                            font-family: Inconsolata !important;
+                        }
+                    `,
+                });
+            },
+        );
+
         test.describe("room reporting", () => {
             test.skip(isDendrite, "Dendrite does not implement room reporting");
-            test("should handle reporting a room", async ({ page, app }) => {
+            test("should handle reporting a room", { tag: "@screenshot" }, async ({ page, app }) => {
                 await viewRoomSummaryByName(page, app, ROOM_NAME);
+
                 await page.getByRole("menuitem", { name: "Report room" }).click();
                 const dialog = await page.getByRole("dialog", { name: "Report Room" });
                 await dialog.getByLabel("reason").fill("This room should be reported");
+                await expect(dialog).toMatchScreenshot("room-report-dialog.png");
                 await dialog.getByRole("button", { name: "Send report" }).click();
-                await expect(page.getByText("Your report was sent.")).toBeVisible();
+
+                // Dialog should have gone
+                await expect(page.locator(".mx_Dialog")).toHaveCount(0);
+            });
+            test("should handle reporting a room and leaving the room", async ({ page, app }) => {
+                await viewRoomSummaryByName(page, app, ROOM_NAME);
+
+                await page.getByRole("menuitem", { name: "Report room" }).click();
+                const dialog = await page.getByRole("dialog", { name: "Report room" });
+                await dialog.getByRole("switch", { name: "Leave room" }).click();
+                await dialog.getByLabel("reason").fill("This room should be reported");
+                await dialog.getByRole("button", { name: "Send report" }).click();
+                await page.getByRole("dialog", { name: "Leave room" }).getByRole("button", { name: "Leave" }).click();
+
+                // Dialog should have gone
+                await expect(page.locator(".mx_Dialog")).toHaveCount(0);
             });
         });
     });
diff --git a/playwright/e2e/room/invites.spec.ts b/playwright/e2e/room/invites.spec.ts
new file mode 100644
index 0000000000..9312b24445
--- /dev/null
+++ b/playwright/e2e/room/invites.spec.ts
@@ -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 { test, expect } from "../../element-web-test";
+
+test.describe("Invites", () => {
+    test.use({
+        displayName: "Alice",
+        botCreateOpts: {
+            displayName: "Bob",
+        },
+    });
+
+    test("should render an invite view", { tag: "@screenshot" }, async ({ page, homeserver, user, bot, app }) => {
+        const roomId = await bot.createRoom({ is_direct: true });
+        await bot.inviteUser(roomId, user.userId);
+        await app.viewRoomByName("Bob");
+        await expect(page.locator(".mx_RoomView")).toMatchScreenshot("Invites_room_view.png", {
+            // Hide the mxid, which is not stable.
+            css: `
+                .mx_RoomPreviewBar_inviter_mxid {
+                    display: none !important;
+                }
+            `,
+        });
+    });
+
+    test("should be able to decline an invite", async ({ page, homeserver, user, bot, app }) => {
+        const roomId = await bot.createRoom({ is_direct: true });
+        await bot.inviteUser(roomId, user.userId);
+        await app.viewRoomByName("Bob");
+        await page.getByRole("button", { name: "Decline", exact: true }).click();
+        await expect(page.getByRole("heading", { name: "Welcome Alice", exact: true })).toBeVisible();
+        await expect(
+            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Bob", exact: true }),
+        ).not.toBeVisible();
+    });
+
+    test(
+        "should be able to decline an invite, report the room and ignore the user",
+        { tag: "@screenshot" },
+        async ({ page, homeserver, user, bot, app }) => {
+            const roomId = await bot.createRoom({ is_direct: true });
+            await bot.inviteUser(roomId, user.userId);
+            await app.viewRoomByName("Bob");
+            await page.getByRole("button", { name: "Decline and block" }).click();
+            await page.getByLabel("Ignore user").click();
+            await page.getByLabel("Report room").click();
+            await page.getByLabel("Reason").fill("Do not want the room");
+            const roomReported = page.waitForRequest(
+                (req) =>
+                    req.url().endsWith(`/_matrix/client/v3/rooms/${encodeURIComponent(roomId)}/report`) &&
+                    req.method() === "POST",
+            );
+            await expect(page.getByRole("dialog", { name: "Decline invitation" })).toMatchScreenshot(
+                "Invites_reject_dialog.png",
+            );
+            await page.getByRole("button", { name: "Decline invite" }).click();
+
+            // Check room was reported.
+            await roomReported;
+
+            // Check user is ignored.
+            await app.settings.openUserSettings("Security & Privacy");
+            const ignoredUsersList = page.getByRole("list", { name: "Ignored users" });
+            await ignoredUsersList.scrollIntoViewIfNeeded();
+            await expect(ignoredUsersList.getByRole("listitem", { name: bot.credentials.userId })).toBeVisible();
+        },
+    );
+});
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 427c801ef4..ed1daecf35 100644
--- a/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
+++ b/playwright/e2e/settings/encryption-user-tab/encryption-tab.spec.ts
@@ -19,126 +19,162 @@ import {
 test.describe("Encryption tab", () => {
     test.use({ displayName: "Alice" });
 
-    let recoveryKey: GeneratedSecretStorageKey;
-    let expectedBackupVersion: string;
+    test.describe("when encryption is set up", () => {
+        let recoveryKey: GeneratedSecretStorageKey;
+        let expectedBackupVersion: string;
 
-    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);
-        recoveryKey = res.recoveryKey;
-        expectedBackupVersion = res.expectedBackupVersion;
-    });
+        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);
+            recoveryKey = res.recoveryKey;
+            expectedBackupVersion = res.expectedBackupVersion;
+        });
 
-    test(
-        "should show a 'Verify this device' button if the device is unverified",
-        { tag: "@screenshot" },
-        async ({ page, app, util }) => {
-            const dialog = await util.openEncryptionTab();
-            const content = util.getEncryptionTabContent();
+        test(
+            "should show a 'Verify this device' button if the device is unverified",
+            { tag: "@screenshot" },
+            async ({ page, app, util }) => {
+                const dialog = await util.openEncryptionTab();
+                const content = util.getEncryptionTabContent();
 
-            // The user's device is in an unverified state, therefore the only option available to them here is to verify it
-            const verifyButton = dialog.getByRole("button", { name: "Verify this device" });
-            await expect(verifyButton).toBeVisible();
-            await expect(content).toMatchScreenshot("verify-device-encryption-tab.png");
-            await verifyButton.click();
+                // The user's device is in an unverified state, therefore the only option available to them here is to verify it
+                const verifyButton = dialog.getByRole("button", { name: "Verify this device" });
+                await expect(verifyButton).toBeVisible();
+                await expect(content).toMatchScreenshot("verify-device-encryption-tab.png");
+                await verifyButton.click();
 
-            await util.verifyDevice(recoveryKey);
+                await util.verifyDevice(recoveryKey);
 
-            await expect(content).toMatchScreenshot("default-tab.png", {
-                mask: [content.getByTestId("deviceId"), content.getByTestId("sessionKey")],
-            });
+                await expect(content).toMatchScreenshot("default-tab.png", {
+                    mask: [content.getByTestId("deviceId"), content.getByTestId("sessionKey")],
+                });
 
-            // 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
-            // The backup decryption key should be in cache also, as we got it directly from the 4S
-            await checkDeviceIsConnectedKeyBackup(app, expectedBackupVersion, true);
-        },
-    );
+                // 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 what happens if the cross-signing secrets are in secret storage but are not cached in the local DB.
-    //
-    // This can happen if we verified another device and secret-gossiping failed, or the other device itself lacked the secrets.
-    // We simulate this case by deleting the cached secrets in the indexedDB.
-    test(
-        "should prompt to enter the recovery key when the secrets are not cached locally",
-        { tag: "@screenshot" },
-        async ({ page, app, util }) => {
+        // Test what happens if the cross-signing secrets are in secret storage but are not cached in the local DB.
+        //
+        // This can happen if we verified another device and secret-gossiping failed, or the other device itself lacked the secrets.
+        // We simulate this case by deleting the cached secrets in the indexedDB.
+        test(
+            "should prompt to enter the recovery key when the secrets are not cached locally",
+            { tag: "@screenshot" },
+            async ({ page, app, util }) => {
+                await verifySession(app, recoveryKey.encodedPrivateKey);
+                // We need to delete the cached secrets
+                await deleteCachedSecrets(page);
+
+                await util.openEncryptionTab();
+                // We ask the user to enter the recovery key
+                const dialog = util.getEncryptionTabContent();
+                const enterKeyButton = dialog.getByRole("button", { name: "Enter recovery key" });
+                await expect(enterKeyButton).toBeVisible();
+                await expect(dialog).toMatchScreenshot("out-of-sync-recovery.png");
+                await enterKeyButton.click();
+
+                // Fill the recovery key
+                await util.enterRecoveryKey(recoveryKey);
+                await expect(dialog).toMatchScreenshot("default-tab.png", {
+                    mask: [dialog.getByTestId("deviceId"), dialog.getByTestId("sessionKey")],
+                });
+
+                // 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("should display the reset identity panel when the user clicks on 'Forgot recovery key?'", async ({
+            page,
+            app,
+            util,
+        }) => {
             await verifySession(app, recoveryKey.encodedPrivateKey);
             // We need to delete the cached secrets
             await deleteCachedSecrets(page);
 
+            // The "Key storage is out sync" section is displayed and the user click on the "Forgot recovery key?" button
             await util.openEncryptionTab();
-            // We ask the user to enter the recovery key
             const dialog = util.getEncryptionTabContent();
-            const enterKeyButton = dialog.getByRole("button", { name: "Enter recovery key" });
-            await expect(enterKeyButton).toBeVisible();
-            await expect(dialog).toMatchScreenshot("out-of-sync-recovery.png");
-            await enterKeyButton.click();
+            await dialog.getByRole("button", { name: "Forgot recovery key?" }).click();
 
-            // Fill the recovery key
-            await util.enterRecoveryKey(recoveryKey);
-            await expect(dialog).toMatchScreenshot("default-tab.png", {
-                mask: [dialog.getByTestId("deviceId"), dialog.getByTestId("sessionKey")],
-            });
+            // The user is prompted to reset their identity
+            await expect(
+                dialog.getByText("Forgot your recovery key? You’ll need to reset your identity."),
+            ).toBeVisible();
+        });
 
-            // Check that our device is now cross-signed
-            await checkDeviceIsCrossSigned(app);
+        test("should warn before turning off key storage", { tag: "@screenshot" }, async ({ page, app, util }) => {
+            await verifySession(app, recoveryKey.encodedPrivateKey);
+            await util.openEncryptionTab();
 
-            // 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);
-        },
-    );
+            await page.getByRole("checkbox", { name: "Allow key storage" }).click();
 
-    test("should display the reset identity panel when the user clicks on 'Forgot recovery key?'", async ({
-        page,
-        app,
-        util,
-    }) => {
-        await verifySession(app, recoveryKey.encodedPrivateKey);
-        // We need to delete the cached secrets
-        await deleteCachedSecrets(page);
+            await expect(
+                page.getByRole("heading", { name: "Are you sure you want to turn off key storage and delete it?" }),
+            ).toBeVisible();
 
-        // The "Key storage is out sync" section is displayed and the user click on the "Forgot recovery key?" button
-        await util.openEncryptionTab();
-        const dialog = util.getEncryptionTabContent();
-        await dialog.getByRole("button", { name: "Forgot recovery key?" }).click();
+            await expect(util.getEncryptionTabContent()).toMatchScreenshot("delete-key-storage-confirm.png");
 
-        // The user is prompted to reset their identity
-        await expect(dialog.getByText("Forgot your recovery key? You’ll need to reset your identity.")).toBeVisible();
+            const deleteRequestPromises = [
+                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.master")),
+                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.self_signing")),
+                page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.user_signing")),
+                page.waitForRequest((req) => req.url().endsWith("/account_data/m.megolm_backup.v1")),
+                page.waitForRequest((req) => req.url().endsWith("/account_data/m.secret_storage.default_key")),
+                page.waitForRequest((req) => req.url().includes("/account_data/m.secret_storage.key.")),
+            ];
+
+            await page.getByRole("button", { name: "Delete key storage" }).click();
+
+            await expect(page.getByRole("checkbox", { name: "Allow key storage" })).not.toBeChecked();
+
+            for (const prom of deleteRequestPromises) {
+                const request = await prom;
+                expect(request.method()).toBe("PUT");
+                expect(request.postData()).toBe(JSON.stringify({}));
+            }
+        });
     });
 
-    test("should warn before turning off key storage", { tag: "@screenshot" }, async ({ page, app, util }) => {
-        await verifySession(app, recoveryKey.encodedPrivateKey);
-        await util.openEncryptionTab();
+    test.describe("when encryption is not set up", () => {
+        test("'Verify this device' allows us to become verified", async ({
+            page,
+            user,
+            credentials,
+            app,
+        }, workerInfo) => {
+            const settings = await app.settings.openUserSettings("Encryption");
 
-        await page.getByRole("checkbox", { name: "Allow key storage" }).click();
+            // Initially, our device is not verified
+            await expect(settings.getByRole("heading", { name: "Device not verified" })).toBeVisible();
 
-        await expect(
-            page.getByRole("heading", { name: "Are you sure you want to turn off key storage and delete it?" }),
-        ).toBeVisible();
+            // We will reset our identity
+            await settings.getByRole("button", { name: "Verify this device" }).click();
+            await page.getByRole("button", { name: "Proceed with reset" }).click();
 
-        await expect(util.getEncryptionTabContent()).toMatchScreenshot("delete-key-storage-confirm.png");
+            // First try cancelling and restarting
+            await page.getByRole("button", { name: "Cancel" }).click();
+            await page.getByRole("button", { name: "Proceed with reset" }).click();
 
-        const deleteRequestPromises = [
-            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.master")),
-            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.self_signing")),
-            page.waitForRequest((req) => req.url().endsWith("/account_data/m.cross_signing.user_signing")),
-            page.waitForRequest((req) => req.url().endsWith("/account_data/m.megolm_backup.v1")),
-            page.waitForRequest((req) => req.url().endsWith("/account_data/m.secret_storage.default_key")),
-            page.waitForRequest((req) => req.url().includes("/account_data/m.secret_storage.key.")),
-        ];
+            // 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: "Delete key storage" }).click();
+            // Finally we actually continue
+            await page.getByRole("button", { name: "Continue" }).click();
 
-        await expect(page.getByRole("checkbox", { name: "Allow key storage" })).not.toBeChecked();
-
-        for (const prom of deleteRequestPromises) {
-            const request = await prom;
-            expect(request.method()).toBe("PUT");
-            expect(request.postData()).toBe(JSON.stringify({}));
-        }
+            // Now we are verified, so we see the Key storage toggle
+            await expect(settings.getByRole("heading", { name: "Key storage" })).toBeVisible();
+        });
     });
 });
diff --git a/playwright/e2e/settings/preferences-user-settings-tab.spec.ts b/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
index 33392d8848..e295eceb44 100644
--- a/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
+++ b/playwright/e2e/settings/preferences-user-settings-tab.spec.ts
@@ -21,10 +21,12 @@ 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();
diff --git a/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts b/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
index 7cc4001c58..06ee25e9cb 100644
--- a/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
+++ b/playwright/e2e/settings/roles-permissions-room-settings-tab.spec.ts
@@ -37,6 +37,15 @@ test.describe("Roles & Permissions room settings tab", () => {
         // Change the role of Alice to Moderator (50)
         await combobox.selectOption("Moderator");
         await expect(combobox).toHaveValue("50");
+
+        // Should display a modal to warn that we are demoting the only admin user
+        const modal = await page.locator(".mx_Dialog", {
+            hasText: "Warning",
+        });
+        await expect(modal).toBeVisible();
+        // Click on the continue button in the modal
+        await modal.getByRole("button", { name: "Continue" }).click();
+
         const respPromise = page.waitForRequest("**/state/**");
         await applyButton.click();
         await respPromise;
diff --git a/playwright/e2e/share-dialog/share-by-url.spec.ts b/playwright/e2e/share-dialog/share-by-url.spec.ts
new file mode 100644
index 0000000000..c5b9174782
--- /dev/null
+++ b/playwright/e2e/share-dialog/share-by-url.spec.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 { test, expect } from "../../element-web-test";
+
+test.describe("share from URL", () => {
+    test.use({
+        displayName: "Alice",
+        room: async ({ app }, use) => {
+            const roomId = await app.client.createRoom({ name: "A test room" });
+            await use({ roomId });
+        },
+    });
+
+    test("should share message when users navigates to share URL", async ({ page, user, room, app }) => {
+        await page.goto("/#/share?msg=Hello+world");
+        // 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 app.viewRoomByName("A test room");
+        const lastMessage = page.locator(".mx_RoomView_MessageList .mx_EventTile_last");
+        await expect(lastMessage).toBeVisible();
+        const lastMessageText = await lastMessage.locator(".mx_EventTile_body").innerText();
+        await expect(lastMessageText).toBe("Hello world");
+    });
+});
diff --git a/playwright/e2e/sliding-sync/sliding-sync.spec.ts b/playwright/e2e/sliding-sync/sliding-sync.spec.ts
index 118bd4585e..b540cd11d5 100644
--- a/playwright/e2e/sliding-sync/sliding-sync.spec.ts
+++ b/playwright/e2e/sliding-sync/sliding-sync.spec.ts
@@ -255,8 +255,8 @@ test.describe("Sliding Sync", () => {
         // Select the room to reject
         await page.getByRole("treeitem", { name: "Room to Reject" }).click();
 
-        // Reject the invite
-        await page.locator(".mx_RoomView").getByRole("button", { name: "Reject", exact: true }).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"),
diff --git a/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts b/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
index 683577dce4..eec28099a5 100644
--- a/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
+++ b/playwright/e2e/spaces/threads-activity-centre/threadsActivityCentre.spec.ts
@@ -19,7 +19,6 @@ test.describe("Threads Activity Centre", { tag: "@no-firefox" }, () => {
     test.use({
         displayName: "Alice",
         botCreateOpts: { displayName: "Other User" },
-        labsFlags: ["threadsActivityCentre"],
     });
 
     test(
diff --git a/playwright/e2e/timeline/media-preview-settings.spec.ts b/playwright/e2e/timeline/media-preview-settings.spec.ts
new file mode 100644
index 0000000000..e32a7dbc82
--- /dev/null
+++ b/playwright/e2e/timeline/media-preview-settings.spec.ts
@@ -0,0 +1,139 @@
+/*
+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 fs from "node:fs";
+import { type EventType, type MsgType, type RoomJoinRulesEventContent } from "matrix-js-sdk/src/types";
+
+import { test, expect } from "../../element-web-test";
+
+const MEDIA_FILE = fs.readFileSync("playwright/sample-files/riot.png");
+
+test.describe("Media preview settings", () => {
+    test.use({
+        displayName: "Alan",
+        botCreateOpts: {
+            displayName: "Bob",
+        },
+        room: async ({ app, page, homeserver, bot, user }, use) => {
+            const mxc = (await bot.uploadContent(MEDIA_FILE, { name: "image.png", type: "image/png" })).content_uri;
+            const roomId = await bot.createRoom({
+                name: "Test room",
+                invite: [user.userId],
+                initial_state: [{ type: "m.room.avatar", content: { url: mxc }, state_key: "" }],
+            });
+            await bot.sendEvent(roomId, null, "m.room.message" as EventType, {
+                msgtype: "m.image" as MsgType,
+                body: "image.png",
+                url: mxc,
+            });
+
+            await use({ roomId });
+        },
+    });
+
+    test("should be able to hide avatars of inviters", { tag: "@screenshot" }, async ({ page, app, room, user }) => {
+        let settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Hide avatars of room and inviter").click();
+        await app.closeDialog();
+        await app.viewRoomById(room.roomId);
+        await expect(
+            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
+        ).toMatchScreenshot("invite-no-avatar.png", {
+            // Hide the mxid, which is not stable.
+            css: `
+                .mx_RoomPreviewBar_inviter_mxid {
+                    display: none !important;
+                }
+            `,
+        });
+        await expect(
+            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
+        ).toMatchScreenshot("invite-room-tree-no-avatar.png");
+
+        // And then go back to being visible
+        settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Hide avatars of room and inviter").click();
+        await app.closeDialog();
+        await page.goto("#/home");
+        await app.viewRoomById(room.roomId);
+        await expect(
+            page.getByRole("complementary").filter({ hasText: "Do you want to join Test room" }),
+        ).toMatchScreenshot("invite-with-avatar.png", {
+            // Hide the mxid, which is not stable.
+            css: `
+                .mx_RoomPreviewBar_inviter_mxid {
+                    display: none !important;
+                }
+            `,
+        });
+        await expect(
+            page.getByRole("tree", { name: "Rooms" }).getByRole("treeitem", { name: "Test room" }),
+        ).toMatchScreenshot("invite-room-tree-with-avatar.png");
+    });
+
+    test("should be able to hide media in rooms globally", async ({ page, app, room, user }) => {
+        const settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
+        await app.closeDialog();
+        await app.viewRoomById(room.roomId);
+        await page.getByRole("button", { name: "Accept" }).click();
+        await expect(page.getByText("Show image")).toBeVisible();
+    });
+    test("should be able to hide media in non-private rooms globally", async ({ page, app, room, user, bot }) => {
+        await bot.sendStateEvent(room.roomId, "m.room.join_rules", {
+            join_rule: "public",
+        });
+        const settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Show media in timeline").getByLabel("In private rooms").click();
+        await app.closeDialog();
+        await app.viewRoomById(room.roomId);
+        await page.getByRole("button", { name: "Accept" }).click();
+        await expect(page.getByText("Show image")).toBeVisible();
+        for (const joinRule of ["invite", "knock", "restricted"] as RoomJoinRulesEventContent["join_rule"][]) {
+            await bot.sendStateEvent(room.roomId, "m.room.join_rules", {
+                join_rule: joinRule,
+            } satisfies RoomJoinRulesEventContent);
+            await expect(page.getByText("Show image")).not.toBeVisible();
+        }
+    });
+    test("should be able to show media in rooms globally", async ({ page, app, room, user }) => {
+        const settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
+        await app.closeDialog();
+        await app.viewRoomById(room.roomId);
+        await page.getByRole("button", { name: "Accept" }).click();
+        await expect(page.getByText("Show image")).not.toBeVisible();
+    });
+    test("should be able to hide media in an individual room", async ({ page, app, room, user }) => {
+        const settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
+        await app.closeDialog();
+
+        await app.viewRoomById(room.roomId);
+        await page.getByRole("button", { name: "Accept" }).click();
+
+        const roomSettings = await app.settings.openRoomSettings("General");
+        await roomSettings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
+        await app.closeDialog();
+
+        await expect(page.getByText("Show image")).toBeVisible();
+    });
+    test("should be able to show media in an individual room", async ({ page, app, room, user }) => {
+        const settings = await app.settings.openUserSettings("Preferences");
+        await settings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always hide" }).click();
+        await app.closeDialog();
+
+        await app.viewRoomById(room.roomId);
+        await page.getByRole("button", { name: "Accept" }).click();
+
+        const roomSettings = await app.settings.openRoomSettings("General");
+        await roomSettings.getByLabel("Show media in timeline").getByRole("radio", { name: "Always show" }).click();
+        await app.closeDialog();
+
+        await expect(page.getByText("Show image")).not.toBeVisible();
+    });
+});
diff --git a/playwright/sample-files/example-module.js b/playwright/sample-files/example-module.js
index cb9b80a93b..561dea5fd3 100644
--- a/playwright/sample-files/example-module.js
+++ b/playwright/sample-files/example-module.js
@@ -6,11 +6,19 @@ Please see LICENSE files in the repository root for full details.
 */
 
 export default class ExampleModule {
-    static moduleApiVersion = "^0.1.0";
+    static moduleApiVersion = "^1.0.0";
     constructor(api) {
         this.api = api;
+
+        this.api.i18n.register({
+            key: {
+                en: "%(brand)s module loading successful!",
+                de: "%(brand)s-Module erfolgreich geladen!",
+            },
+        });
     }
     async load() {
-        alert("Testing module loading successful!");
+        const brand = this.api.config.get("brand");
+        alert(this.api.i18n.translate("key", { brand }));
     }
 }
diff --git a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-linux.png b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-linux.png
index 9a7760bfd0..6a72dec4e2 100644
Binary files a/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-linux.png and b/playwright/snapshots/app-loading/feature-detection.spec.ts/unsupported-browser-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 7a108b441c..26c506097a 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/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 95b10570a0..1a66050e5f 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 8f2a488c00..86cb11aad9 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 9bc23433a5..043e35b6be 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/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 8cf4a3c97b..6c71c11b1d 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
new file mode 100644
index 0000000000..c7396da41d
Binary files /dev/null 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
new file mode 100644
index 0000000000..15620d3612
Binary files /dev/null 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 3f700037cb..7b73e0b819 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 e01564eeb4..eb3add5733 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
new file mode 100644
index 0000000000..70ed4bb782
Binary files /dev/null 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/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 45d2a775ea..6781c1d364 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/filter-menu-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/filter-menu-linux.png
new file mode 100644
index 0000000000..fe056af3d3
Binary files /dev/null and b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/filter-menu-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 a84f3ac260..4c82dc21e7 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
new file mode 100644
index 0000000000..2f12ee4e41
Binary files /dev/null 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-empty-room-list-linux.png b/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-empty-room-list-linux.png
deleted file mode 100644
index 94b09ac14f..0000000000
Binary files a/playwright/snapshots/left-panel/room-list-panel/room-list-filter-sort.spec.ts/unread-empty-room-list-linux.png and /dev/null 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 8c056bc754..5458395e67 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 06314b5213..878818f820 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 8382d3b184..9f501a58d4 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 6c871b6b9c..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 49cf6ef08a..c706e71b0f 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 bdb7f8fa2a..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 313f6a1d14..bada16f154 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
new file mode 100644
index 0000000000..b0de5b5253
Binary files /dev/null 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.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 8da208a85d..aa73d79988 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 eccf48a528..55f4af3972 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
new file mode 100644
index 0000000000..36b7304a01
Binary files /dev/null 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 d6e1d2e549..1f2b691b4a 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..cc2adcc598
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 ded76f85e3..310912e50d 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 ae5bfdabc1..9fa531f5b1 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
new file mode 100644
index 0000000000..dac349eb2d
Binary files /dev/null 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 d48bf49aa4..144604ffeb 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 40206cc22b..126f5d718d 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
new file mode 100644
index 0000000000..a8fbeb0b03
Binary files /dev/null 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
new file mode 100644
index 0000000000..724218249b
Binary files /dev/null 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
new file mode 100644
index 0000000000..d6ecbc1c40
Binary files /dev/null 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 35bcbea2a1..1bd0eaab1b 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
new file mode 100644
index 0000000000..b654a1f592
Binary files /dev/null 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 35de485457..1a53f6151e 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 87c88e8e46..05f824a2c8 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/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-ltr-rtldisplayname-linux.png
index 4bf016b825..35523b7db8 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/basic-message-rtl-rtldisplayname-linux.png
index ee69990523..40a096409e 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-ltr-rtldisplayname-linux.png
index eea2b47469..557613e7e6 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/edited-message-rtl-rtldisplayname-linux.png
index 4d2e9c593d..bd26e84628 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-ltr-rtldisplayname-linux.png
index 1bb3582578..055ad23a81 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-ltr-rtldisplayname-linux.png
index 0e65830b51..cfb905b689 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rich-rtl-rtldisplayname-linux.png
index 26bd9f7523..ea29e98a75 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/emote-rtl-rtldisplayname-linux.png
index 3f50a1406f..d84780f530 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-ltr-rtldisplayname-linux.png
index 37096f025c..b59d960f4f 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-rtldisplayname-linux.png b/playwright/snapshots/messages/messages.spec.ts/reply-message-trl-rtldisplayname-linux.png
index 52ced56c83..f6eaea241a 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/oidc/oidc-native.spec.ts/token-expired-linux.png b/playwright/snapshots/oidc/oidc-native.spec.ts/token-expired-linux.png
index 17479bb870..e85b83f2f1 100644
Binary files a/playwright/snapshots/oidc/oidc-native.spec.ts/token-expired-linux.png and b/playwright/snapshots/oidc/oidc-native.spec.ts/token-expired-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 6818add73e..7b7f296be1 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/register/register.spec.ts/email-prompt-linux.png b/playwright/snapshots/register/register.spec.ts/email-prompt-linux.png
index dd458f3157..9bc2ed101b 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/server-picker-linux.png b/playwright/snapshots/register/register.spec.ts/server-picker-linux.png
index 16b686e101..db3ec188d1 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/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
new file mode 100644
index 0000000000..f466c17d64
Binary files /dev/null and b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-All-new-pinned-messages-linux.png differ
diff --git a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png b/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png
deleted file mode 100644
index fee99165ab..0000000000
Binary files a/playwright/snapshots/release-announcement/releaseAnnouncement.spec.ts/release-announcement-Threads-Activity-Centre-linux.png and /dev/null differ
diff --git a/playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png b/playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png
index c1fced1938..2dbd40ffd9 100644
Binary files a/playwright/snapshots/right-panel/file-panel.spec.ts/empty-linux.png and b/playwright/snapshots/right-panel/file-panel.spec.ts/empty-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
new file mode 100644
index 0000000000..627071591c
Binary files /dev/null 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-extensions-linux.png b/playwright/snapshots/right-panel/right-panel.spec.ts/with-extensions-linux.png
new file mode 100644
index 0000000000..8333d55b46
Binary files /dev/null and b/playwright/snapshots/right-panel/right-panel.spec.ts/with-extensions-linux.png differ
diff --git a/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-linux.png b/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-linux.png
index 931e9f9491..febb73c235 100644
Binary files a/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-linux.png and b/playwright/snapshots/right-panel/right-panel.spec.ts/with-leave-room-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
new file mode 100644
index 0000000000..9a3479a1e6
Binary files /dev/null and b/playwright/snapshots/right-panel/right-panel.spec.ts/with-long-name-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
new file mode 100644
index 0000000000..22ef895d1a
Binary files /dev/null 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
new file mode 100644
index 0000000000..86d0e37b93
Binary files /dev/null and b/playwright/snapshots/room/invites.spec.ts/Invites-room-view-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 e0d8b80639..3b4031063c 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/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 88d7919dcc..20518942b0 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 cc3c32ee95..a847075a4d 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/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png
index 6e0cc3e06f..a913d4ab19 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-bubble-linux.png differ
diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png
index 8e29fd26b8..b2167e0a12 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/message-layout-panel.spec.ts/message-layout-panel-modern-linux.png differ
diff --git a/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-linux.png b/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-linux.png
index eb249d0b24..1acda5968e 100644
Binary files a/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-linux.png and b/playwright/snapshots/settings/appearance-user-settings-tab/theme-choice-panel.spec.ts/theme-panel-dark-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 6a95f36da7..e18821b774 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/advanced.spec.ts/reset-cryptographic-identity-linux.png b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/reset-cryptographic-identity-linux.png
index 18213b5375..6e0b105c24 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/reset-cryptographic-identity-linux.png and b/playwright/snapshots/settings/encryption-user-tab/advanced.spec.ts/reset-cryptographic-identity-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png
index bf57e8c875..c999365534 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/default-tab-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png
index 10ece913d4..237c853a1b 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png and b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/delete-key-storage-confirm-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png
index ba4ccfe18e..0ad192f2c2 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png and b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/out-of-sync-recovery-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png
index dcc1f25008..0bb5fad763 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/encryption-tab.spec.ts/verify-device-encryption-tab-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-linux.png
index 8d6f2a74f4..a42cb394d7 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/change-key-1-encryption-tab-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 e8def33311..ec0207a227 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/default-recovery-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/default-recovery-linux.png
index 9c23f7ea20..1f34a3f2e0 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/default-recovery-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/default-recovery-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png
index a1f286ac73..3835cfe727 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-1-encryption-tab-linux.png differ
diff --git a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-2-encryption-tab-linux.png b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-2-encryption-tab-linux.png
index 0d8aa341c0..6c3e9eab2c 100644
Binary files a/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-key-2-encryption-tab-linux.png and b/playwright/snapshots/settings/encryption-user-tab/recovery.spec.ts/set-up-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 00a96ce522..cb0bc78e00 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 e7dcea9436..e26d001a90 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 833dc3a8c7..c326c3f8e4 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/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 91d402ed8a..c484a47fc9 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 b40d183830..c6605b5b64 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/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 748bdd5c21..9cd18bee3e 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/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
new file mode 100644
index 0000000000..377282a2c8
Binary files /dev/null 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
new file mode 100644
index 0000000000..29d129f73f
Binary files /dev/null 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
new file mode 100644
index 0000000000..452f08d3e2
Binary files /dev/null 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
new file mode 100644
index 0000000000..93459507d0
Binary files /dev/null and b/playwright/snapshots/timeline/media-preview-settings.spec.ts/invite-with-avatar-linux.png differ
diff --git a/playwright/snapshots/user-menu/user-menu.spec.ts/user-menu-linux.png b/playwright/snapshots/user-menu/user-menu.spec.ts/user-menu-linux.png
index 73c9ce49ac..79335b66ae 100644
Binary files a/playwright/snapshots/user-menu/user-menu.spec.ts/user-menu-linux.png and b/playwright/snapshots/user-menu/user-menu.spec.ts/user-menu-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 dc832f31c9..a4f6a476f6 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/res/apple-app-site-association b/res/apple-app-site-association
index 94869effab..0235e6ada1 100644
--- a/res/apple-app-site-association
+++ b/res/apple-app-site-association
@@ -5,8 +5,7 @@
         "appIDs": [
           "7J4U792NQT.im.vector.app",
           "7J4U792NQT.io.element.elementx",
-          "7J4U792NQT.io.element.elementx.nightly",
-          "7J4U792NQT.io.element.elementx.pr"
+          "7J4U792NQT.io.element.elementx.nightly"
         ],
         "components": [
           {
@@ -28,8 +27,7 @@
     "apps": [
       "7J4U792NQT.im.vector.app",
       "7J4U792NQT.io.element.elementx",
-      "7J4U792NQT.io.element.elementx.nightly",
-      "7J4U792NQT.io.element.elementx.pr"
+      "7J4U792NQT.io.element.elementx.nightly"
     ]
   }
 }
diff --git a/res/css/_common.pcss b/res/css/_common.pcss
index 75180013f6..3eed8c93c6 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -593,6 +593,7 @@ legend {
 .mx_Dialog
     button:not(
         .mx_EncryptionUserSettingsTab button,
+        .mx_EncryptionCard button,
         .mx_UserProfileSettings button,
         .mx_ShareDialog button,
         .mx_UnpinAllDialog button,
@@ -600,6 +601,7 @@ legend {
         .mx_Dialog_nonDialogButton,
         .mx_AccessibleButton,
         .mx_IdentityServerPicker button,
+        .mx_AccessSecretStorageDialog button,
         [class|="maplibregl"]
     ),
 .mx_Dialog_buttons button:not(.mx_Dialog_nonDialogButton, .mx_AccessibleButton),
diff --git a/res/css/_components.pcss b/res/css/_components.pcss
index d622f69b84..247dd7edab 100644
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -116,6 +116,7 @@
 @import "./views/auth/_Welcome.pcss";
 @import "./views/avatars/_BaseAvatar.pcss";
 @import "./views/avatars/_DecoratedRoomAvatar.pcss";
+@import "./views/avatars/_RoomAvatarView.pcss";
 @import "./views/avatars/_WidgetAvatar.pcss";
 @import "./views/avatars/_WithPresenceIndicator.pcss";
 @import "./views/beta/_BetaCard.pcss";
@@ -130,6 +131,7 @@
 @import "./views/dialogs/_BugReportDialog.pcss";
 @import "./views/dialogs/_ChangelogDialog.pcss";
 @import "./views/dialogs/_CompoundDialog.pcss";
+@import "./views/dialogs/_ConfirmKeyStorageOffDialog.pcss";
 @import "./views/dialogs/_ConfirmSpaceUserActionDialog.pcss";
 @import "./views/dialogs/_ConfirmUserActionDialog.pcss";
 @import "./views/dialogs/_CreateRoomDialog.pcss";
@@ -278,6 +280,8 @@
 @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";
 @import "./views/rooms/_Autocomplete.pcss";
 @import "./views/rooms/_AuxPanel.pcss";
@@ -340,8 +344,6 @@
 @import "./views/rooms/wysiwyg_composer/components/_FormattingButtons.pcss";
 @import "./views/rooms/wysiwyg_composer/components/_LinkModal.pcss";
 @import "./views/settings/_AvatarSetting.pcss";
-@import "./views/settings/_CrossSigningPanel.pcss";
-@import "./views/settings/_CryptographyPanel.pcss";
 @import "./views/settings/_FontScalingPanel.pcss";
 @import "./views/settings/_ImageSizePanel.pcss";
 @import "./views/settings/_IntegrationManager.pcss";
@@ -354,7 +356,6 @@
 @import "./views/settings/_PhoneNumbers.pcss";
 @import "./views/settings/_PowerLevelSelector.pcss";
 @import "./views/settings/_RoomProfileSettings.pcss";
-@import "./views/settings/_SecureBackupPanel.pcss";
 @import "./views/settings/_SetIntegrationManager.pcss";
 @import "./views/settings/_SettingsFieldset.pcss";
 @import "./views/settings/_SettingsHeader.pcss";
@@ -380,6 +381,7 @@
 @import "./views/settings/tabs/user/_AppearanceUserSettingsTab.pcss";
 @import "./views/settings/tabs/user/_HelpUserSettingsTab.pcss";
 @import "./views/settings/tabs/user/_KeyboardUserSettingsTab.pcss";
+@import "./views/settings/tabs/user/_MediaPreviewAccountSettings.pcss";
 @import "./views/settings/tabs/user/_MjolnirUserSettingsTab.pcss";
 @import "./views/settings/tabs/user/_PreferencesUserSettingsTab.pcss";
 @import "./views/settings/tabs/user/_SecurityUserSettingsTab.pcss";
diff --git a/res/css/components/views/elements/_FilterDropdown.pcss b/res/css/components/views/elements/_FilterDropdown.pcss
index a2682213c6..22eb5f2ff1 100644
--- a/res/css/components/views/elements/_FilterDropdown.pcss
+++ b/res/css/components/views/elements/_FilterDropdown.pcss
@@ -16,7 +16,7 @@ Please see LICENSE files in the repository root for full details.
 
         border: 1px solid $quinary-content;
         border-radius: 8px;
-        box-shadow: 0px 1px 3px rgba(23, 25, 28, 0.05);
+        box-shadow: 0px 1px 3px rgb(23, 25, 28, 0.05);
 
         background-color: $system;
 
diff --git a/res/css/components/views/location/_Marker.pcss b/res/css/components/views/location/_Marker.pcss
index 5a8fef9199..a3bfc10f52 100644
--- a/res/css/components/views/location/_Marker.pcss
+++ b/res/css/components/views/location/_Marker.pcss
@@ -14,7 +14,7 @@ Please see LICENSE files in the repository root for full details.
     width: 42px;
     height: 42px;
     border-radius: 50%;
-    filter: drop-shadow(0px 3px 5px rgba(0, 0, 0, 0.2));
+    filter: drop-shadow(0px 3px 5px rgb(0, 0, 0, 0.2));
     background-color: currentColor;
 
     display: flex;
diff --git a/res/css/components/views/location/_ZoomButtons.pcss b/res/css/components/views/location/_ZoomButtons.pcss
index f98c7bf1b0..bb7d72e4e8 100644
--- a/res/css/components/views/location/_ZoomButtons.pcss
+++ b/res/css/components/views/location/_ZoomButtons.pcss
@@ -24,7 +24,7 @@ Please see LICENSE files in the repository root for full details.
         height: $ZoomButtons_button-size;
         width: $ZoomButtons_button-size;
         background: $background;
-        box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.25);
+        box-shadow: 0px 4px 12px rgb(0, 0, 0, 0.25);
 
         .mx_ZoomButtons_icon {
             $ZoomButtons_icon-size: 12px;
diff --git a/res/css/components/views/pips/_WidgetPip.pcss b/res/css/components/views/pips/_WidgetPip.pcss
index e515e3eec0..b9ad791021 100644
--- a/res/css/components/views/pips/_WidgetPip.pcss
+++ b/res/css/components/views/pips/_WidgetPip.pcss
@@ -48,7 +48,7 @@ $height: 220px;
     display: flex;
     font-size: $font-12px;
     font-weight: var(--cpd-font-weight-semibold);
-    background: linear-gradient(rgba(0, 0, 0, 0.9), rgba(0, 0, 0, 0));
+    background: linear-gradient(rgb(0, 0, 0, 0.9), rgb(0, 0, 0, 0));
 }
 
 .mx_WidgetPip_backButton {
@@ -69,5 +69,5 @@ $height: 220px;
     display: flex;
     justify-content: flex-end;
     align-items: flex-end;
-    background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.9));
+    background: linear-gradient(rgb(0, 0, 0, 0), rgb(0, 0, 0, 0.9));
 }
diff --git a/res/css/structures/_ContextualMenu.pcss b/res/css/structures/_ContextualMenu.pcss
index 9e6be31ac0..3c1363f896 100644
--- a/res/css/structures/_ContextualMenu.pcss
+++ b/res/css/structures/_ContextualMenu.pcss
@@ -23,7 +23,7 @@ Please see LICENSE files in the repository root for full details.
 
 .mx_ContextualMenu {
     border-radius: 12px;
-    box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.1);
+    box-shadow: 0px 4px 24px rgb(0, 0, 0, 0.1);
     background-color: var(--cpd-color-bg-canvas-default);
     border: var(--cpd-border-width-1) solid var(--cpd-color-border-interactive-secondary);
     color: $primary-content;
diff --git a/res/css/structures/_GenericDropdownMenu.pcss b/res/css/structures/_GenericDropdownMenu.pcss
index dd9dc0ade1..1d0fb79648 100644
--- a/res/css/structures/_GenericDropdownMenu.pcss
+++ b/res/css/structures/_GenericDropdownMenu.pcss
@@ -41,7 +41,7 @@ Please see LICENSE files in the repository root for full details.
         padding-bottom: 10px;
 
         border: 1px solid $quinary-content;
-        box-shadow: 0 1px 3px rgba(23, 25, 28, 0.05);
+        box-shadow: 0 1px 3px rgb(23, 25, 28, 0.05);
     }
 
     .mx_ContextualMenu_chevron_top {
diff --git a/res/css/structures/_LeftPanel.pcss b/res/css/structures/_LeftPanel.pcss
index c76fd5da02..c1886b6b80 100644
--- a/res/css/structures/_LeftPanel.pcss
+++ b/res/css/structures/_LeftPanel.pcss
@@ -28,6 +28,12 @@ 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;
diff --git a/res/css/structures/_SpaceHierarchy.pcss b/res/css/structures/_SpaceHierarchy.pcss
index c1be2eb142..88c40b6fab 100644
--- a/res/css/structures/_SpaceHierarchy.pcss
+++ b/res/css/structures/_SpaceHierarchy.pcss
@@ -293,7 +293,7 @@ Please see LICENSE files in the repository root for full details.
     > hr {
         border: none;
         height: 1px;
-        background-color: rgba(141, 151, 165, 0.2);
+        background-color: rgb(141, 151, 165, 0.2);
         margin: 20px 0;
     }
 
diff --git a/res/css/structures/_SpacePanel.pcss b/res/css/structures/_SpacePanel.pcss
index 664d781829..64044c4c5c 100644
--- a/res/css/structures/_SpacePanel.pcss
+++ b/res/css/structures/_SpacePanel.pcss
@@ -30,6 +30,11 @@ Please see LICENSE files in the repository root for full details.
         width: 68px;
     }
 
+    &.newUi {
+        background-color: var(--cpd-color-bg-canvas-default);
+        border-right: 1px solid var(--cpd-color-bg-subtle-primary);
+    }
+
     .mx_SpacePanel_toggleCollapse {
         position: absolute;
         width: 18px;
@@ -352,9 +357,9 @@ Please see LICENSE files in the repository root for full details.
             mask-image: linear-gradient(
                 to top,
                 transparent,
-                rgba(255, 255, 255, 30%) 4px,
-                rgba(255, 255, 255, 55%) 8px,
-                rgba(255, 255, 255, 75%) 12px,
+                rgb(255, 255, 255, 30%) 4px,
+                rgb(255, 255, 255, 55%) 8px,
+                rgb(255, 255, 255, 75%) 12px,
                 black 16px
             );
         }
@@ -370,9 +375,9 @@ Please see LICENSE files in the repository root for full details.
                 linear-gradient(
                     to top,
                     transparent,
-                    rgba(255, 255, 255, 30%) 4px,
-                    rgba(255, 255, 255, 55%) 8px,
-                    rgba(255, 255, 255, 75%) 12px,
+                    rgb(255, 255, 255, 30%) 4px,
+                    rgb(255, 255, 255, 55%) 8px,
+                    rgb(255, 255, 255, 75%) 12px,
                     black 16px
                 );
             mask-position:
@@ -399,6 +404,11 @@ Please see LICENSE files in the repository root for full details.
             display: block;
         }
     }
+
+    &.newUi .mx_UserMenu {
+        margin-top: var(--cpd-space-4x);
+        border-bottom: none;
+    }
 }
 
 .mx_SpacePanel_contextMenu {
diff --git a/res/css/structures/_SplashPage.pcss b/res/css/structures/_SplashPage.pcss
index 26eec65a93..bd57fbb48d 100644
--- a/res/css/structures/_SplashPage.pcss
+++ b/res/css/structures/_SplashPage.pcss
@@ -19,12 +19,12 @@ Please see LICENSE files in the repository root for full details.
         background-image:
             radial-gradient(
                 53.85% 66.75% at 87.55% 0%,
-                hsla(250deg, 76%, 71%, 0.261) 0%,
-                hsla(250deg, 100%, 88%, 0) 100%
+                hsl(250deg, 76%, 71%, 0.261) 0%,
+                hsl(250deg, 100%, 88%, 0) 100%
             ),
-            radial-gradient(41.93% 41.93% at 0% 0%, hsla(222deg, 29%, 20%, 0.28) 0%, hsla(250deg, 100%, 88%, 0) 100%),
-            radial-gradient(100% 100% at 0% 0%, hsla(250deg, 100%, 88%, 0.174) 0%, hsla(0deg, 100%, 86%, 0) 100%),
-            radial-gradient(106.35% 96.26% at 100% 0%, hsla(250deg, 100%, 88%, 0.4) 0%, hsla(167deg, 76%, 82%, 0) 100%);
+            radial-gradient(41.93% 41.93% at 0% 0%, hsl(222deg, 29%, 20%, 0.28) 0%, hsl(250deg, 100%, 88%, 0) 100%),
+            radial-gradient(100% 100% at 0% 0%, hsl(250deg, 100%, 88%, 0.174) 0%, hsl(0deg, 100%, 86%, 0) 100%),
+            radial-gradient(106.35% 96.26% at 100% 0%, hsl(250deg, 100%, 88%, 0.4) 0%, hsl(167deg, 76%, 82%, 0) 100%);
         /* blur to reduce color banding issues due to alpha-blending multiple gradients */
         filter: blur(8px);
         inset: -9px;
@@ -34,8 +34,8 @@ Please see LICENSE files in the repository root for full details.
             /* gradient to apply different amounts of dithering to different parts of the gradient */
                 linear-gradient(
                     to bottom,
-                    /* 10% dithering at the top */ rgba(0, 0, 0, 0.9) 20%,
-                    /* 80% dithering at the bottom */ rgba(0, 0, 0, 0.2) 100%
+                    /* 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/_ToastContainer.pcss b/res/css/structures/_ToastContainer.pcss
index 6022c01c99..cf1d7fd4a9 100644
--- a/res/css/structures/_ToastContainer.pcss
+++ b/res/css/structures/_ToastContainer.pcss
@@ -21,7 +21,7 @@ Please see LICENSE files in the repository root for full details.
         grid-row: 2 / 4;
         grid-column: 1;
         background-color: $system;
-        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.5);
+        box-shadow: 0px 4px 20px rgb(0, 0, 0, 0.5);
         border-radius: 8px;
     }
 
@@ -30,7 +30,7 @@ Please see LICENSE files in the repository root for full details.
         grid-column: 1;
         background-color: var(--cpd-color-bg-canvas-default);
         color: $primary-content;
-        box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.1);
+        box-shadow: 0px 4px 24px rgb(0, 0, 0, 0.1);
         border: var(--cpd-border-width-1) solid var(--cpd-color-border-interactive-secondary);
         border-radius: 12px;
         overflow: hidden;
@@ -79,6 +79,11 @@ Please see LICENSE files in the repository root for full details.
                 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;
diff --git a/res/css/structures/auth/_Registration.pcss b/res/css/structures/auth/_Registration.pcss
index 409767e1da..a1833df1d0 100644
--- a/res/css/structures/auth/_Registration.pcss
+++ b/res/css/structures/auth/_Registration.pcss
@@ -37,7 +37,7 @@ Please see LICENSE files in the repository root for full details.
     justify-content: space-between;
     padding-top: 16px;
     margin-top: 16px;
-    border-top: 1px solid rgba(141, 151, 165, 0.2);
+    border-top: 1px solid rgb(141, 151, 165, 0.2);
 
     > * {
         flex-basis: content;
diff --git a/res/css/views/auth/_AuthFooter.pcss b/res/css/views/auth/_AuthFooter.pcss
index 96b41406ad..57545e7691 100644
--- a/res/css/views/auth/_AuthFooter.pcss
+++ b/res/css/views/auth/_AuthFooter.pcss
@@ -11,7 +11,7 @@ Please see LICENSE files in the repository root for full details.
     font: var(--cpd-font-body-md-regular);
     opacity: 0.72;
     padding: 20px 0;
-    background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+    background: linear-gradient(rgb(0, 0, 0, 0), rgb(0, 0, 0, 0.8));
 }
 
 .mx_AuthFooter a:link,
diff --git a/res/css/views/auth/_AuthPage.pcss b/res/css/views/auth/_AuthPage.pcss
index 469bca5053..3ae17122be 100644
--- a/res/css/views/auth/_AuthPage.pcss
+++ b/res/css/views/auth/_AuthPage.pcss
@@ -19,7 +19,7 @@ Please see LICENSE files in the repository root for full details.
     display: flex;
     margin: 100px auto auto;
     border-radius: 4px;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.33);
+    box-shadow: 0 2px 4px 0 rgb(0, 0, 0, 0.33);
     background-color: $authpage-modal-bg-color;
 
     @media only screen and (max-height: 768px) {
diff --git a/res/css/views/avatars/_RoomAvatarView.pcss b/res/css/views/avatars/_RoomAvatarView.pcss
new file mode 100644
index 0000000000..0d5523a9f1
--- /dev/null
+++ b/res/css/views/avatars/_RoomAvatarView.pcss
@@ -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.
+ */
+
+.mx_RoomAvatarView {
+    --room-avatar-size: 32px;
+
+    position: relative;
+
+    /* Keep the container to the same size than the avatar */
+    inline-size: var(--room-avatar-size);
+    block-size: var(--room-avatar-size);
+
+    .mx_RoomAvatarView_RoomAvatar {
+        mask-position: center;
+        mask-size: contain;
+        mask-repeat: no-repeat;
+    }
+
+    .mx_RoomAvatarView_RoomAvatar_icon {
+        mask-image: url("$(res)/img/element-icons/roomlist/room-avatar-view-icon-mask.svg");
+    }
+
+    .mx_RoomAvatarView_RoomAvatar_presence {
+        mask-image: url("$(res)/img/element-icons/roomlist/room-avatar-view-presence-mask.svg");
+    }
+
+    .mx_RoomAvatarView_icon {
+        position: absolute;
+
+        /* Place half the icon inside the avatar */
+        /* Avatar size - (icon size (16px) / 2) */
+        left: calc((var(--room-avatar-size) - 8px));
+        bottom: var(--cpd-space-0-5x);
+    }
+
+    .mx_RoomAvatarView_PresenceDecoration {
+        position: absolute;
+
+        /* Place half the icon inside the avatar */
+        /* Avatar size - (icon size (8px) / 2) */
+        left: calc((var(--room-avatar-size) - 4px));
+        bottom: var(--cpd-space-0-5x);
+    }
+}
diff --git a/res/css/views/dialogs/_CompoundDialog.pcss b/res/css/views/dialogs/_CompoundDialog.pcss
index b43fa1f14e..1c3ba01f1c 100644
--- a/res/css/views/dialogs/_CompoundDialog.pcss
+++ b/res/css/views/dialogs/_CompoundDialog.pcss
@@ -77,7 +77,7 @@ Please see LICENSE files in the repository root for full details.
     max-height: 80%;
 
     .mx_CompoundDialog_footer {
-        box-shadow: 0px -4px 4px rgba(0, 0, 0, 0.05); /* hardcoded colour for both themes */
+        box-shadow: 0px -4px 4px rgb(0, 0, 0, 0.05); /* hardcoded colour for both themes */
         z-index: 1; /* needed to make footer & shadow appear above dialog content */
     }
 }
diff --git a/res/css/views/dialogs/_ConfirmKeyStorageOffDialog.pcss b/res/css/views/dialogs/_ConfirmKeyStorageOffDialog.pcss
new file mode 100644
index 0000000000..5ac53c7b70
--- /dev/null
+++ b/res/css/views/dialogs/_ConfirmKeyStorageOffDialog.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_ConfirmKeyStorageOffDialog {
+    .mx_Dialog_border {
+        width: 600px;
+    }
+
+    .mx_EncryptionCard {
+        text-align: center;
+    }
+}
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
index 8105833830..5d06545ae8 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.pcss
@@ -34,13 +34,13 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_EditHistoryMessage_deletion {
         color: rgb(255, 76, 85);
-        background-color: rgba(255, 76, 85, 0.1);
+        background-color: rgb(255, 76, 85, 0.1);
         text-decoration: line-through;
     }
 
     .mx_EditHistoryMessage_insertion {
         color: rgb(26, 169, 123);
-        background-color: rgba(26, 169, 123, 0.1);
+        background-color: rgb(26, 169, 123, 0.1);
         text-decoration: underline;
     }
 
diff --git a/res/css/views/dialogs/_ReportRoomDialog.pcss b/res/css/views/dialogs/_ReportRoomDialog.pcss
index 7323ac65c9..b656638d9c 100644
--- a/res/css/views/dialogs/_ReportRoomDialog.pcss
+++ b/res/css/views/dialogs/_ReportRoomDialog.pcss
@@ -5,7 +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.
 */
 
-.mx_ReportRoomDialog {
+.mx_ReportRoomDialog,
+.mx_DeclineAndBlockInviteDialog {
     textarea {
         font: var(--cpd-font-body-md-regular);
         border: 1px solid var(--cpd-color-border-interactive-primary);
@@ -13,4 +14,28 @@ Please see LICENSE files in the repository root for full details.
         border-radius: 0.5rem;
         padding: var(--cpd-space-3x) var(--cpd-space-4x);
     }
+
+    /*
+      Workaround to fix labels appearing with the wrong color.
+
+      .mx_Dialog (in res/css/_common.pcss) redefines the body color
+      as $light-fg-color rather than the standard primary color.
+
+      This forces the colour to match the Compound style, but
+      in the future the Dialogs should not force a color.
+    */
+    form label {
+        color: var(--cpd-color-text-primary);
+    }
+}
+
+.mx_DeclineAndBlockInviteDialog {
+    div[aria-disabled="true"] > label {
+        color: var(--cpd-color-text-secondary);
+    }
+
+    .mx_SettingsFlag_label {
+        color: var(--cpd-color-text-primary);
+        font-weight: var(--cpd-font-weight-semibold);
+    }
 }
diff --git a/res/css/views/dialogs/_SpotlightDialog.pcss b/res/css/views/dialogs/_SpotlightDialog.pcss
index d00acd6786..592431c2f1 100644
--- a/res/css/views/dialogs/_SpotlightDialog.pcss
+++ b/res/css/views/dialogs/_SpotlightDialog.pcss
@@ -412,7 +412,8 @@ Please see LICENSE files in the repository root for full details.
             .mx_SpotlightDialog_joinRoomAlias,
             .mx_SpotlightDialog_explorePublicRooms,
             .mx_SpotlightDialog_explorePublicSpaces,
-            .mx_SpotlightDialog_startGroupChat {
+            .mx_SpotlightDialog_startGroupChat,
+            .mx_SpotlightDialog_searchMessages {
                 padding-left: $spacing-32;
                 position: relative;
 
@@ -451,22 +452,14 @@ Please see LICENSE files in the repository root for full details.
                 mask-image: url("$(res)/img/element-icons/group-members.svg");
             }
 
+            .mx_SpotlightDialog_searchMessages::before {
+                mask-image: url("$(res)/img/element-icons/room/search-inset.svg");
+            }
+
             .mx_SpotlightDialog_otherSearches_messageSearchText {
                 font-size: $font-15px;
                 line-height: $font-24px;
             }
-
-            .mx_SpotlightDialog_otherSearches_messageSearchIcon {
-                display: inline-block;
-                width: 24px;
-                height: 24px;
-                background-color: $secondary-content;
-                vertical-align: text-bottom;
-                mask-repeat: no-repeat;
-                mask-position: center;
-                mask-size: contain;
-                mask-image: url("$(res)/img/element-icons/room/search-inset.svg");
-            }
         }
 
         .mx_SpotlightDialog_result_details {
diff --git a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
index 83b9fe96b4..9d81097d60 100644
--- a/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
+++ b/res/css/views/dialogs/security/_AccessSecretStorageDialog.pcss
@@ -7,62 +7,14 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_AccessSecretStorageDialog {
-    .mx_AccessSecretStorageDialog_titleWithIcon {
-        &::before {
-            content: "";
-            display: inline-block;
-            width: 24px;
-            height: 24px;
-            margin-inline-end: $spacing-8;
-            position: relative;
-            top: 5px;
-            background-color: $primary-content;
-        }
-
-        &.mx_AccessSecretStorageDialog_resetBadge::before {
-            /* The image isn't capable of masking, so we use a background instead. */
-            background-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
-            background-size: 24px;
-            background-color: transparent;
-        }
-
-        &.mx_AccessSecretStorageDialog_secureBackupTitle::before {
-            mask-image: url("$(res)/img/feather-customised/secure-backup.svg");
-        }
-
-        &.mx_AccessSecretStorageDialog_securePhraseTitle::before {
-            mask-image: url("$(res)/img/feather-customised/secure-phrase.svg");
-        }
+    &.mx_EncryptionCard {
+        /* override some styles that we don't need */
+        border: 0px none;
+        box-shadow: none;
+        padding: 0px;
     }
 
     .mx_AccessSecretStorageDialog_primaryContainer {
-        .mx_AccessSecretStorageDialog_passPhraseInput {
-            width: 300px;
-            border: 1px solid $accent;
-            border-radius: 5px;
-        }
-
-        .mx_AccessSecretStorageDialog_keyStatus {
-            height: 30px;
-        }
-
-        .mx_AccessSecretStorageDialog_recoveryKeyEntry {
-            display: flex;
-            align-items: center;
-
-            .mx_AccessSecretStorageDialog_recoveryKeyEntry_textInput {
-                flex-grow: 1;
-            }
-
-            .mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText {
-                margin: $spacing-16;
-            }
-
-            .mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput {
-                display: none;
-            }
-        }
-
         .mx_AccessSecretStorageDialog_recoveryKeyFeedback {
             &::before {
                 content: "";
@@ -76,64 +28,18 @@ Please see LICENSE files in the repository root for full details.
                 margin-inline-end: 5px;
             }
 
-            &.mx_AccessSecretStorageDialog_recoveryKeyFeedback--valid {
-                color: $accent;
-
-                &::before {
-                    mask-image: url("@vector-im/compound-design-tokens/icons/check.svg");
-                    background-color: $accent;
-                }
-            }
-
             &.mx_AccessSecretStorageDialog_recoveryKeyFeedback--invalid {
                 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;
                 }
             }
         }
+    }
 
-        .mx_Dialog_buttons {
-            $spacingStart: $spacing-24; /* 16px icon + 8px padding */
-
-            text-align: initial;
-            display: flex;
-            flex-flow: column;
-            gap: 14px;
-
-            .mx_Dialog_buttons_additive {
-                float: none;
-
-                .mx_AccessSecretStorageDialog_reset {
-                    position: relative;
-                    padding-inline-start: $spacingStart;
-                    /* To avoid bold styling inherent with <strong> elements */
-                    font-weight: inherit;
-
-                    &::before {
-                        content: "";
-                        display: inline-block;
-                        position: absolute;
-                        height: 16px;
-                        width: 16px;
-                        left: 0;
-                        top: 2px; /* alignment */
-                        background-image: url("@vector-im/compound-design-tokens/icons/error-solid.svg");
-                        background-size: contain;
-                    }
-
-                    .mx_AccessSecretStorageDialog_reset_link {
-                        color: $alert;
-                    }
-                }
-            }
-
-            .mx_Dialog_buttons_row {
-                gap: $spacing-16; /* TODO: needs normalization */
-                padding-inline-start: $spacingStart;
-            }
-        }
+    .mx_EncryptionCard_buttons {
+        margin-top: var(--cpd-space-20x);
     }
 }
diff --git a/res/css/views/elements/_ServerPicker.pcss b/res/css/views/elements/_ServerPicker.pcss
index fa0b46599f..aced0976ce 100644
--- a/res/css/views/elements/_ServerPicker.pcss
+++ b/res/css/views/elements/_ServerPicker.pcss
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 .mx_ServerPicker {
     margin-bottom: 14px;
     padding-bottom: $spacing-16;
-    border-bottom: 1px solid rgba(141, 151, 165, 0.2);
+    border-bottom: 1px solid rgb(141, 151, 165, 0.2);
     display: grid;
     grid-template-columns: auto min-content;
     grid-template-rows: auto auto auto;
diff --git a/res/css/views/emojipicker/_EmojiPicker.pcss b/res/css/views/emojipicker/_EmojiPicker.pcss
index c1a666a672..7542424605 100644
--- a/res/css/views/emojipicker/_EmojiPicker.pcss
+++ b/res/css/views/emojipicker/_EmojiPicker.pcss
@@ -20,7 +20,7 @@ Please see LICENSE files in the repository root for full details.
     flex: 1;
     overflow-y: scroll;
     scrollbar-width: thin;
-    scrollbar-color: rgba(0, 0, 0, 0.2) transparent;
+    scrollbar-color: rgb(0, 0, 0, 0.2) transparent;
 }
 
 .mx_EmojiPicker_header {
@@ -201,7 +201,7 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_EmojiPicker_item_selected {
-    color: rgba(0, 0, 0, 0.5);
+    color: rgb(0, 0, 0, 0.5);
     border: 1px solid $accent;
     padding: 4px;
 }
diff --git a/res/css/views/location/_LocationPicker.pcss b/res/css/views/location/_LocationPicker.pcss
index 9384411cf8..c103f7d68a 100644
--- a/res/css/views/location/_LocationPicker.pcss
+++ b/res/css/views/location/_LocationPicker.pcss
@@ -76,7 +76,7 @@ Please see LICENSE files in the repository root for full details.
     pointer-events: none;
 
     span {
-        box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.15);
+        box-shadow: 0px 4px 15px rgb(0, 0, 0, 0.15);
         border-radius: 8px;
         padding: $spacing-8;
         background-color: $background;
diff --git a/res/css/views/messages/_MImageBody.pcss b/res/css/views/messages/_MImageBody.pcss
index bb5f879568..0e73c1d55c 100644
--- a/res/css/views/messages/_MImageBody.pcss
+++ b/res/css/views/messages/_MImageBody.pcss
@@ -25,7 +25,7 @@ Please see LICENSE files in the repository root for full details.
     overflow: hidden;
 
     /* Hardcoded colours because it's the same on all themes */
-    background-color: rgba(0, 0, 0, 0.6);
+    background-color: rgb(0, 0, 0, 0.6);
     color: #ffffff;
 }
 
diff --git a/res/css/views/right_panel/_BaseCard.pcss b/res/css/views/right_panel/_BaseCard.pcss
index 83e1fc28d4..035485428a 100644
--- a/res/css/views/right_panel/_BaseCard.pcss
+++ b/res/css/views/right_panel/_BaseCard.pcss
@@ -99,7 +99,7 @@ Please see LICENSE files in the repository root for full details.
 
         .mx_AccessibleButton_kind_secondary {
             color: $secondary-content;
-            background-color: rgba(141, 151, 165, 0.2);
+            background-color: rgb(141, 151, 165, 0.2);
             font: var(--cpd-font-body-md-semibold);
         }
 
@@ -125,7 +125,7 @@ Please see LICENSE files in the repository root for full details.
         padding-bottom: 10px;
 
         border: var(--cpd-border-width-1) solid var(--cpd-color-border-interactive-secondary);
-        box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.1);
+        box-shadow: 0px 4px 24px rgb(0, 0, 0, 0.1);
     }
 
     .mx_ContextualMenu_chevron_top {
diff --git a/res/css/views/right_panel/_EmptyState.pcss b/res/css/views/right_panel/_EmptyState.pcss
index 05bc2882b8..15e78414c9 100644
--- a/res/css/views/right_panel/_EmptyState.pcss
+++ b/res/css/views/right_panel/_EmptyState.pcss
@@ -30,7 +30,7 @@ Please see LICENSE files in the repository root for full details.
         height: 775px;
         right: -253.77px;
         top: 0;
-        background: radial-gradient(49.95% 49.95% at 50% 50%, rgba(13, 189, 139, 0.12) 0%, rgba(18, 115, 235, 0) 100%);
+        background: radial-gradient(49.95% 49.95% at 50% 50%, rgb(13, 189, 139, 0.12) 0%, rgb(18, 115, 235, 0) 100%);
         transform: rotate(-89.69deg);
         overflow: hidden;
     }
diff --git a/res/css/views/right_panel/_ExtensionsCard.pcss b/res/css/views/right_panel/_ExtensionsCard.pcss
index 65dc23f667..c98fa3e9dc 100644
--- a/res/css/views/right_panel/_ExtensionsCard.pcss
+++ b/res/css/views/right_panel/_ExtensionsCard.pcss
@@ -7,12 +7,11 @@ Please see LICENSE files in the repository root for full details.
 */
 
 .mx_ExtensionsCard {
-    --cpd-separator-inset: var(--cpd-space-4x);
-    --cpd-separator-spacing: var(--cpd-space-4x);
-
+    --cpd-separator-spacing: var(--cpd-space-6x);
+    --AddExtension-overlap: -76px;
     .mx_AutoHideScrollbar {
         padding: 0 var(--cpd-space-4x);
-        margin-top: var(--cpd-space-3x);
+        margin-top: var(--cpd-space-6x);
         box-sizing: border-box;
 
         /* Styling for the "Add extensions" button */
@@ -70,7 +69,7 @@ Please see LICENSE files in the repository root for full details.
                     top: var(--cpd-space-2x); /* equal to padding-top of parent */
                     left: 0;
                     border-radius: 12px;
-                    background-color: rgba(141, 151, 165, 0.1);
+                    background-color: rgb(141, 151, 165, 0.1);
                 }
             }
 
@@ -128,6 +127,11 @@ Please see LICENSE files in the repository root for full details.
 
     .mx_EmptyState::before {
         /* Overlap the Add extensions button */
-        top: -76px;
+        top: var(--AddExtension-overlap);
+    }
+
+    .mx_EmptyState {
+        /* Stop empty state scrolling */
+        height: calc(100% + var(--AddExtension-overlap));
     }
 }
diff --git a/res/css/views/right_panel/_PinnedMessagesCard.pcss b/res/css/views/right_panel/_PinnedMessagesCard.pcss
index 6a15653398..1b73787f22 100644
--- a/res/css/views/right_panel/_PinnedMessagesCard.pcss
+++ b/res/css/views/right_panel/_PinnedMessagesCard.pcss
@@ -37,7 +37,7 @@ Please see LICENSE files in the repository root for full details.
         display: flex;
         justify-content: center;
         align-items: center;
-        box-shadow: 0 4px 24px 0 rgba(27, 29, 34, 0.1);
+        box-shadow: 0 4px 24px 0 rgb(27, 29, 34, 0.1);
         background: var(--cpd-color-bg-canvas-default);
     }
 
diff --git a/res/css/views/right_panel/_UserInfo.pcss b/res/css/views/right_panel/_UserInfo.pcss
index 7fccd6e2d1..3030b93c03 100644
--- a/res/css/views/right_panel/_UserInfo.pcss
+++ b/res/css/views/right_panel/_UserInfo.pcss
@@ -109,6 +109,15 @@ Please see LICENSE files in the repository root for full details.
             font-size: $font-20px;
             line-height: $font-25px;
 
+            /* E2E icon wrapper */
+            .mx_Flex > span {
+                display: inline-block;
+            }
+        }
+
+        .mx_UserInfo_profile_name {
+            min-height: 30px;
+
             /* limit to 2 lines, show an ellipsis if it overflows */
             /* this looks webkit specific but is supported by Firefox 68+ */
             display: -webkit-box;
@@ -118,15 +127,6 @@ Please see LICENSE files in the repository root for full details.
             overflow: hidden;
             word-break: break-all;
             text-overflow: ellipsis;
-
-            /* E2E icon wrapper */
-            .mx_Flex > span {
-                display: inline-block;
-            }
-        }
-
-        .mx_UserInfo_profile_name {
-            height: 30px;
         }
 
         .mx_UserInfo_profile_mxid {
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
index 595f47f9c8..9af934c308 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListHeaderView.pcss
@@ -21,10 +21,6 @@
         }
     }
 
-    button {
-        color: var(--cpd-color-icon-secondary);
-    }
-
     .mx_SpaceMenu_button {
         svg {
             transition: transform 0.1s linear;
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss b/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
index 1594781dbd..ac58a69bef 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListItemView.pcss
@@ -7,27 +7,19 @@
 
 /**
  * The RoomListItemView has the following structure:
- * button----------------------------------------|
- * | <-12px-> container--------------------------|
- * |          | room avatar <-12px-> content-----|
- * |          |                      | room_name |
- * |          |                      | ----------| <-- border
- * |---------------------------------------------|
+ * button--------------------------------------------------|
+ * | <-12px-> container------------------------------------|
+ * |          | room avatar <-8px-> content----------------|
+ * |          |                      | room_name <- 20px ->|
+ * |          |                      | --------------------| <-- border
+ * |-------------------------------------------------------|
  */
 .mx_RoomListItemView {
     all: unset;
     cursor: pointer;
 
-    &:hover {
-        background-color: var(--cpd-color-bg-action-secondary-hovered);
-
-        .mx_RoomListItemView_content {
-            padding-right: var(--cpd-space-1-5x);
-        }
-    }
-
     .mx_RoomListItemView_container {
-        padding-left: var(--cpd-space-2x);
+        padding-left: var(--cpd-space-3x);
         font: var(--cpd-font-body-md-regular);
         height: 100%;
 
@@ -38,8 +30,21 @@
             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);
 
-            span {
+            .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;
@@ -48,26 +53,24 @@
     }
 }
 
-.mx_RoomListItemView_menu_open {
+.mx_RoomListItemView_hover {
     background-color: var(--cpd-color-bg-action-secondary-hovered);
+}
 
-    .mx_RoomListItemView_content {
-        padding-right: var(--cpd-space-1-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_selected {
     background-color: var(--cpd-color-bg-action-secondary-pressed);
 }
 
-.mx_RoomListItemView_notification_decoration {
-    .mx_RoomListItemView_content {
-        padding-right: var(--cpd-space-2x);
-    }
-}
-
-.mx_RoomListItemView_empty {
-    .mx_RoomListItemView_content {
-        padding-right: var(--cpd-space-3x);
-    }
+.mx_RoomListItemView_bold .mx_RoomListItemView_roomName {
+    font: var(--cpd-font-body-md-semibold);
 }
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss b/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
index 8a97086df8..f6f98e1efe 100644
--- a/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
+++ b/res/css/views/rooms/RoomListPanel/_RoomListSearch.pcss
@@ -21,6 +21,7 @@
         flex: 1;
         font: var(--cpd-font-body-md-regular);
         color: var(--cpd-color-text-secondary);
+        min-width: 0;
 
         span {
             flex: 1;
@@ -28,6 +29,17 @@
             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;
+            }
         }
     }
 
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListSecondaryFilters.pcss b/res/css/views/rooms/RoomListPanel/_RoomListSecondaryFilters.pcss
new file mode 100644
index 0000000000..0fa8dc12ae
--- /dev/null
+++ b/res/css/views/rooms/RoomListPanel/_RoomListSecondaryFilters.pcss
@@ -0,0 +1,12 @@
+/*
+ * 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_RoomListSecondaryFilters {
+    font: var(--cpd-font-body-md-medium);
+    margin: var(--cpd-space-2x);
+    margin-left: var(--cpd-space-1x);
+}
diff --git a/res/css/views/rooms/RoomListPanel/_RoomListSkeleton.pcss b/res/css/views/rooms/RoomListPanel/_RoomListSkeleton.pcss
new file mode 100644
index 0000000000..2e644cbba1
--- /dev/null
+++ b/res/css/views/rooms/RoomListPanel/_RoomListSkeleton.pcss
@@ -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.
+ */
+
+.mx_RoomListSkeleton {
+    position: relative;
+    margin-left: 4px;
+    height: 100%;
+
+    &::before {
+        background-color: var(--cpd-color-bg-subtle-secondary);
+        width: 100%;
+        height: 100%;
+
+        content: "";
+        position: absolute;
+        mask-repeat: repeat-y;
+        mask-size: auto 96px;
+        mask-image: url("$(res)/img/element-icons/roomlist/room-list-item-skeleton.svg");
+    }
+}
diff --git a/res/css/views/rooms/_EventBubbleTile.pcss b/res/css/views/rooms/_EventBubbleTile.pcss
index c25cbfcec4..1607c45924 100644
--- a/res/css/views/rooms/_EventBubbleTile.pcss
+++ b/res/css/views/rooms/_EventBubbleTile.pcss
@@ -312,7 +312,7 @@ Please see LICENSE files in the repository root for full details.
                 .mx_MessageTimestamp {
                     border-radius: var(--MBody-border-radius);
                     /* Hardcoded colours because it's the same on all themes */
-                    background-color: rgba(0, 0, 0, 0.6);
+                    background-color: rgb(0, 0, 0, 0.6);
                     color: #ffffff;
                     padding: 0px 4px 0px 4px;
                 }
diff --git a/res/css/views/rooms/_PinnedMessageBanner.pcss b/res/css/views/rooms/_PinnedMessageBanner.pcss
index da9b75b17d..d7f3ddd1fb 100644
--- a/res/css/views/rooms/_PinnedMessageBanner.pcss
+++ b/res/css/views/rooms/_PinnedMessageBanner.pcss
@@ -19,7 +19,7 @@
     border-bottom: 1px solid var(--cpd-color-gray-400);
 
     /* From figma */
-    box-shadow: 0 var(--cpd-space-2x) var(--cpd-space-6x) calc(var(--cpd-space-2x) * -1) rgba(27, 29, 34, 0.1);
+    box-shadow: 0 var(--cpd-space-2x) var(--cpd-space-6x) calc(var(--cpd-space-2x) * -1) rgb(27, 29, 34, 0.1);
 
     .mx_PinnedMessageBanner_main {
         background: transparent;
diff --git a/res/css/views/rooms/_RoomSublist.pcss b/res/css/views/rooms/_RoomSublist.pcss
index 7b0da5608e..3361bce4bb 100644
--- a/res/css/views/rooms/_RoomSublist.pcss
+++ b/res/css/views/rooms/_RoomSublist.pcss
@@ -404,8 +404,7 @@ Please see LICENSE files in the repository root for full details.
     height: 240px;
 
     &::before {
-        background: $roomsublist-skeleton-ui-bg;
-
+        background-color: var(--cpd-color-bg-subtle-secondary);
         width: 100%;
         height: 100%;
 
diff --git a/res/css/views/settings/_CrossSigningPanel.pcss b/res/css/views/settings/_CrossSigningPanel.pcss
deleted file mode 100644
index e9b2aa0c29..0000000000
--- a/res/css/views/settings/_CrossSigningPanel.pcss
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2024 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.
-*/
-
-.mx_CrossSigningPanel_statusList {
-    border-spacing: 0;
-
-    th {
-        text-align: start;
-    }
-
-    td,
-    th {
-        padding: 0;
-
-        &:first-of-type {
-            padding-inline-end: 1em;
-        }
-    }
-}
-
-.mx_CrossSigningPanel_buttonRow {
-    margin: 1em 0;
-
-    :nth-child(n + 1) {
-        margin-inline-end: 10px;
-    }
-}
-
-.mx_CrossSigningPanel_advanced {
-    width: fit-content;
-}
diff --git a/res/css/views/settings/_CryptographyPanel.pcss b/res/css/views/settings/_CryptographyPanel.pcss
deleted file mode 100644
index 9c174ceaab..0000000000
--- a/res/css/views/settings/_CryptographyPanel.pcss
+++ /dev/null
@@ -1,32 +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_CryptographyPanel_sessionInfo {
-    padding: 0em;
-    border-spacing: 0px;
-}
-.mx_CryptographyPanel_sessionInfo > tr {
-    vertical-align: baseline;
-    padding: 0em;
-
-    th {
-        text-align: start;
-    }
-
-    td,
-    th {
-        padding: 0 1em 0 0;
-    }
-}
-
-.mx_CryptographyPanel_importExportButtons {
-    display: inline-flex;
-    flex-flow: wrap;
-    row-gap: $spacing-8;
-    column-gap: $spacing-8;
-}
diff --git a/res/css/views/settings/_JoinRuleSettings.pcss b/res/css/views/settings/_JoinRuleSettings.pcss
index 485434f0da..fcb21fca96 100644
--- a/res/css/views/settings/_JoinRuleSettings.pcss
+++ b/res/css/views/settings/_JoinRuleSettings.pcss
@@ -53,6 +53,14 @@ Please see LICENSE files in the repository root for full details.
         display: block;
     }
 
+    &.mx_StyledRadioButton_disabled {
+        opacity: 0.5;
+    }
+
+    &.mx_StyledRadioButton_disabled + span {
+        opacity: 0.5;
+    }
+
     & + span {
         display: inline-block;
         margin-left: 34px;
@@ -71,3 +79,7 @@ Please see LICENSE files in the repository root for full details.
     font: var(--cpd-font-body-md-regular);
     margin-top: var(--cpd-space-2x);
 }
+
+.mx_JoinRuleSettings_recommended {
+    color: $accent-1000;
+}
diff --git a/res/css/views/settings/_SecureBackupPanel.pcss b/res/css/views/settings/_SecureBackupPanel.pcss
deleted file mode 100644
index 6e571af339..0000000000
--- a/res/css/views/settings/_SecureBackupPanel.pcss
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-Copyright 2018 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_SecureBackupPanel_deviceName {
-    font-style: italic;
-}
-
-.mx_SecureBackupPanel_buttonRow {
-    margin: 1em 0;
-    display: inline-flex;
-    flex-flow: wrap;
-    row-gap: 10px;
-
-    :nth-child(n + 1) {
-        margin-inline-end: 10px;
-    }
-}
-
-.mx_SecureBackupPanel_statusList {
-    border-spacing: 0;
-
-    th {
-        text-align: start;
-    }
-
-    td,
-    th {
-        padding: 0;
-
-        &:first-of-type {
-            padding-inline-end: 1em;
-        }
-    }
-}
-
-.mx_SecureBackupPanel_advanced {
-    width: fit-content;
-}
diff --git a/res/css/views/settings/encryption/_EncryptionCard.pcss b/res/css/views/settings/encryption/_EncryptionCard.pcss
index 87118135e5..5598facfa9 100644
--- a/res/css/views/settings/encryption/_EncryptionCard.pcss
+++ b/res/css/views/settings/encryption/_EncryptionCard.pcss
@@ -12,7 +12,7 @@
     padding: var(--cpd-space-10x);
     border-radius: var(--cpd-space-4x);
     /* From figma */
-    box-shadow: 0 1.2px 2.4px 0 rgba(27, 29, 34, 0.15);
+    box-shadow: 0 1.2px 2.4px 0 rgb(27, 29, 34, 0.15);
     border: 1px solid var(--cpd-color-gray-400);
 
     .mx_EncryptionCard_header {
diff --git a/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss b/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss
new file mode 100644
index 0000000000..68187854c1
--- /dev/null
+++ b/res/css/views/settings/tabs/user/_MediaPreviewAccountSettings.pcss
@@ -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.
+*/
+
+.mx_MediaPreviewAccountSetting_Radio {
+    margin: var(--cpd-space-1x) 0;
+}
+
+.mx_MediaPreviewAccountSetting {
+    margin-top: var(--cpd-space-1x);
+}
+
+.mx_MediaPreviewAccountSetting_RadioHelp {
+    margin-top: 0;
+    margin-bottom: var(--cpd-space-1x);
+}
+
+.mx_MediaPreviewAccountSetting_Form {
+    width: 100%;
+}
+
+.mx_MediaPreviewAccountSetting_ToggleSwitch {
+    font: var(--cpd-font-body-md-medium);
+    letter-spacing: var(--cpd-font-letter-spacing-body-md);
+}
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
index cb5d1fbc94..82f839042b 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.pcss
@@ -11,6 +11,12 @@ Please see LICENSE files in the repository root for full details.
     column-gap: $spacing-8;
 }
 
+.mx_SecurityUserSettingsTab_ignoredUsers {
+    padding-left: 0;
+    margin: 0;
+    list-style: none;
+}
+
 .mx_SecurityUserSettingsTab_ignoredUser {
     margin-bottom: $spacing-4;
 }
diff --git a/res/css/views/verification/_VerificationShowSas.pcss b/res/css/views/verification/_VerificationShowSas.pcss
index 5e007ed234..1a24519cbf 100644
--- a/res/css/views/verification/_VerificationShowSas.pcss
+++ b/res/css/views/verification/_VerificationShowSas.pcss
@@ -46,10 +46,8 @@ Please see LICENSE files in the repository root for full details.
 }
 
 .mx_VerificationShowSas_emojiSas_label {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
     font-size: $font-12px;
+    word-break: break-all;
 }
 
 .mx_VerificationShowSas_emojiSas_break {
diff --git a/res/css/views/voip/_LegacyCallView.pcss b/res/css/views/voip/_LegacyCallView.pcss
index 007e8b5000..93d3e23f8b 100644
--- a/res/css/views/voip/_LegacyCallView.pcss
+++ b/res/css/views/voip/_LegacyCallView.pcss
@@ -95,7 +95,7 @@ Please see LICENSE files in the repository root for full details.
                     height: 100%;
                     left: 0;
                     right: 0;
-                    background-color: rgba(0, 0, 0, 0.6);
+                    background-color: rgb(0, 0, 0, 0.6);
                 }
             }
 
@@ -144,7 +144,7 @@ Please see LICENSE files in the repository root for full details.
         border-radius: 8px;
 
         background-color: $system;
-        box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.2);
+        box-shadow: 0px 4px 20px rgb(0, 0, 0, 0.2);
 
         .mx_LegacyCallViewButtons {
             bottom: 13px;
diff --git a/res/css/views/voip/_VideoFeed.pcss b/res/css/views/voip/_VideoFeed.pcss
index 6abe390126..8522fbb4f0 100644
--- a/res/css/views/voip/_VideoFeed.pcss
+++ b/res/css/views/voip/_VideoFeed.pcss
@@ -56,7 +56,7 @@ Please see LICENSE files in the repository root for full details.
         width: 24px;
         height: 24px;
 
-        background-color: rgba(0, 0, 0, 0.5); /* Same on both themes */
+        background-color: rgb(0, 0, 0, 0.5); /* Same on both themes */
         border-radius: 100%;
 
         &::before {
diff --git a/res/img/element-icons/roomlist/room-avatar-view-icon-mask.svg b/res/img/element-icons/roomlist/room-avatar-view-icon-mask.svg
new file mode 100644
index 0000000000..8eaf2f1831
--- /dev/null
+++ b/res/img/element-icons/roomlist/room-avatar-view-icon-mask.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <path d="M32 0H0V32H32C26.4772 32 22 27.5228 22 22C22 16.4772 26.4772 12 32 12V0Z"/>
+</svg>
diff --git a/res/img/element-icons/roomlist/room-avatar-view-presence-mask.svg b/res/img/element-icons/roomlist/room-avatar-view-presence-mask.svg
new file mode 100644
index 0000000000..b40f382d4b
--- /dev/null
+++ b/res/img/element-icons/roomlist/room-avatar-view-presence-mask.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+    <path d="M36 -4H-4V36H36V30.4722C34.9385 31.4223 33.5367 32 32 32C28.6863 32 26 29.3137 26 26C26 22.6863 28.6863 20 32 20C33.5367 20 34.9385 20.5777 36 21.5278V-4Z" />
+</svg>
diff --git a/res/img/element-icons/roomlist/room-list-item-skeleton.svg b/res/img/element-icons/roomlist/room-list-item-skeleton.svg
new file mode 100644
index 0000000000..adf56e4ed8
--- /dev/null
+++ b/res/img/element-icons/roomlist/room-list-item-skeleton.svg
@@ -0,0 +1,14 @@
+<svg width="309" height="96" viewBox="0 0 309 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="8" y="8" width="32" height="32" rx="16" fill="#E1E6EC"/>
+<mask id="path-2-inside-1_1772_38931" fill="white">
+<path d="M52 0H309V48H52V0Z"/>
+</mask>
+<path d="M309 48V47.5H52V48V48.5H309V48Z" fill="#F0F2F5" mask="url(#path-2-inside-1_1772_38931)"/>
+<path d="M48.7 25.938C48.7 25.3073 48.8467 24.75 49.14 24.266C49.4187 23.7673 49.8073 23.3787 50.306 23.1C50.79 22.8067 51.3473 22.66 51.978 22.66H64.386C65.0167 22.66 65.574 22.8067 66.058 23.1C66.5567 23.3787 66.9453 23.7673 67.224 24.266C67.5173 24.75 67.664 25.3073 67.664 25.938V25.982C67.664 26.6127 67.5173 27.1773 67.224 27.676C66.9453 28.16 66.5567 28.5487 66.058 28.842C65.574 29.1207 65.0167 29.26 64.386 29.26H51.978C51.3473 29.26 50.79 29.1207 50.306 28.842C49.8073 28.5487 49.4187 28.16 49.14 27.676C48.8467 27.1773 48.7 26.6127 48.7 25.982V25.938ZM61.0535 25.938C61.0535 25.3073 61.2002 24.75 61.4935 24.266C61.7722 23.7673 62.1608 23.3787 62.6595 23.1C63.1435 22.8067 63.7008 22.66 64.3315 22.66H76.7395C77.3702 22.66 77.9275 22.8067 78.4115 23.1C78.9102 23.3787 79.2988 23.7673 79.5775 24.266C79.8708 24.75 80.0175 25.3073 80.0175 25.938V25.982C80.0175 26.6127 79.8708 27.1773 79.5775 27.676C79.2988 28.16 78.9102 28.5487 78.4115 28.842C77.9275 29.1207 77.3702 29.26 76.7395 29.26H64.3315C63.7008 29.26 63.1435 29.1207 62.6595 28.842C62.1608 28.5487 61.7722 28.16 61.4935 27.676C61.2002 27.1773 61.0535 26.6127 61.0535 25.982V25.938ZM73.407 25.938C73.407 25.3073 73.5537 24.75 73.847 24.266C74.1257 23.7673 74.5144 23.3787 75.013 23.1C75.497 22.8067 76.0544 22.66 76.685 22.66H89.093C89.7237 22.66 90.281 22.8067 90.765 23.1C91.2637 23.3787 91.6524 23.7673 91.931 24.266C92.2244 24.75 92.371 25.3073 92.371 25.938V25.982C92.371 26.6127 92.2244 27.1773 91.931 27.676C91.6524 28.16 91.2637 28.5487 90.765 28.842C90.281 29.1207 89.7237 29.26 89.093 29.26H76.685C76.0544 29.26 75.497 29.1207 75.013 28.842C74.5144 28.5487 74.1257 28.16 73.847 27.676C73.5537 27.1773 73.407 26.6127 73.407 25.982V25.938ZM85.7605 25.938C85.7605 25.3073 85.9072 24.75 86.2005 24.266C86.4792 23.7673 86.8679 23.3787 87.3665 23.1C87.8505 22.8067 88.4079 22.66 89.0385 22.66H101.447C102.077 22.66 102.635 22.8067 103.119 23.1C103.617 23.3787 104.006 23.7673 104.285 24.266C104.578 24.75 104.725 25.3073 104.725 25.938V25.982C104.725 26.6127 104.578 27.1773 104.285 27.676C104.006 28.16 103.617 28.5487 103.119 28.842C102.635 29.1207 102.077 29.26 101.447 29.26H89.0385C88.4079 29.26 87.8505 29.1207 87.3665 28.842C86.8679 28.5487 86.4792 28.16 86.2005 27.676C85.9072 27.1773 85.7605 26.6127 85.7605 25.982V25.938ZM98.1141 25.938C98.1141 25.3073 98.2607 24.75 98.5541 24.266C98.8327 23.7673 99.2214 23.3787 99.7201 23.1C100.204 22.8067 100.761 22.66 101.392 22.66H113.8C114.431 22.66 114.988 22.8067 115.472 23.1C115.971 23.3787 116.359 23.7673 116.638 24.266C116.931 24.75 117.078 25.3073 117.078 25.938V25.982C117.078 26.6127 116.931 27.1773 116.638 27.676C116.359 28.16 115.971 28.5487 115.472 28.842C114.988 29.1207 114.431 29.26 113.8 29.26H101.392C100.761 29.26 100.204 29.1207 99.7201 28.842C99.2214 28.5487 98.8327 28.16 98.5541 27.676C98.2607 27.1773 98.1141 26.6127 98.1141 25.982V25.938ZM110.468 25.938C110.468 25.3073 110.614 24.75 110.908 24.266C111.186 23.7673 111.575 23.3787 112.074 23.1C112.558 22.8067 113.115 22.66 113.746 22.66H126.154C126.784 22.66 127.342 22.8067 127.826 23.1C128.324 23.3787 128.713 23.7673 128.992 24.266C129.285 24.75 129.432 25.3073 129.432 25.938V25.982C129.432 26.6127 129.285 27.1773 128.992 27.676C128.713 28.16 128.324 28.5487 127.826 28.842C127.342 29.1207 126.784 29.26 126.154 29.26H113.746C113.115 29.26 112.558 29.1207 112.074 28.842C111.575 28.5487 111.186 28.16 110.908 27.676C110.614 27.1773 110.468 26.6127 110.468 25.982V25.938ZM122.821 25.938C122.821 25.3073 122.968 24.75 123.261 24.266C123.54 23.7673 123.928 23.3787 124.427 23.1C124.911 22.8067 125.468 22.66 126.099 22.66H138.507C139.138 22.66 139.695 22.8067 140.179 23.1C140.678 23.3787 141.066 23.7673 141.345 24.266C141.638 24.75 141.785 25.3073 141.785 25.938V25.982C141.785 26.6127 141.638 27.1773 141.345 27.676C141.066 28.16 140.678 28.5487 140.179 28.842C139.695 29.1207 139.138 29.26 138.507 29.26H126.099C125.468 29.26 124.911 29.1207 124.427 28.842C123.928 28.5487 123.54 28.16 123.261 27.676C122.968 27.1773 122.821 26.6127 122.821 25.982V25.938ZM135.175 25.938C135.175 25.3073 135.321 24.75 135.615 24.266C135.893 23.7673 136.282 23.3787 136.781 23.1C137.265 22.8067 137.822 22.66 138.453 22.66H150.861C151.491 22.66 152.049 22.8067 152.533 23.1C153.031 23.3787 153.42 23.7673 153.699 24.266C153.992 24.75 154.139 25.3073 154.139 25.938V25.982C154.139 26.6127 153.992 27.1773 153.699 27.676C153.42 28.16 153.031 28.5487 152.533 28.842C152.049 29.1207 151.491 29.26 150.861 29.26H138.453C137.822 29.26 137.265 29.1207 136.781 28.842C136.282 28.5487 135.893 28.16 135.615 27.676C135.321 27.1773 135.175 26.6127 135.175 25.982V25.938ZM160.72 25.938C160.72 25.3073 160.866 24.75 161.16 24.266C161.438 23.7673 161.827 23.3787 162.326 23.1C162.81 22.8067 163.367 22.66 163.998 22.66H176.406C177.036 22.66 177.594 22.8067 178.078 23.1C178.576 23.3787 178.965 23.7673 179.244 24.266C179.537 24.75 179.684 25.3073 179.684 25.938V25.982C179.684 26.6127 179.537 27.1773 179.244 27.676C178.965 28.16 178.576 28.5487 178.078 28.842C177.594 29.1207 177.036 29.26 176.406 29.26H163.998C163.367 29.26 162.81 29.1207 162.326 28.842C161.827 28.5487 161.438 28.16 161.16 27.676C160.866 27.1773 160.72 26.6127 160.72 25.982V25.938ZM173.073 25.938C173.073 25.3073 173.22 24.75 173.513 24.266C173.792 23.7673 174.18 23.3787 174.679 23.1C175.163 22.8067 175.72 22.66 176.351 22.66H182.687C183.318 22.66 183.875 22.8067 184.359 23.1C184.858 23.3787 185.246 23.7673 185.525 24.266C185.818 24.75 185.965 25.3073 185.965 25.938V25.982C185.965 26.6127 185.818 27.1773 185.525 27.676C185.246 28.16 184.858 28.5487 184.359 28.842C183.875 29.1207 183.318 29.26 182.687 29.26H176.351C175.72 29.26 175.163 29.1207 174.679 28.842C174.18 28.5487 173.792 28.16 173.513 27.676C173.22 27.1773 173.073 26.6127 173.073 25.982V25.938ZM179.368 25.938C179.368 25.3073 179.515 24.75 179.808 24.266C180.087 23.7673 180.475 23.3787 180.974 23.1C181.458 22.8067 182.015 22.66 182.646 22.66H195.054C195.685 22.66 196.242 22.8067 196.726 23.1C197.225 23.3787 197.613 23.7673 197.892 24.266C198.185 24.75 198.332 25.3073 198.332 25.938V25.982C198.332 26.6127 198.185 27.1773 197.892 27.676C197.613 28.16 197.225 28.5487 196.726 28.842C196.242 29.1207 195.685 29.26 195.054 29.26H182.646C182.015 29.26 181.458 29.1207 180.974 28.842C180.475 28.5487 180.087 28.16 179.808 27.676C179.515 27.1773 179.368 26.6127 179.368 25.982V25.938ZM191.721 25.938C191.721 25.3073 191.868 24.75 192.161 24.266C192.44 23.7673 192.829 23.3787 193.327 23.1C193.811 22.8067 194.369 22.66 194.999 22.66H207.407C208.038 22.66 208.595 22.8067 209.079 23.1C209.578 23.3787 209.967 23.7673 210.245 24.266C210.539 24.75 210.685 25.3073 210.685 25.938V25.982C210.685 26.6127 210.539 27.1773 210.245 27.676C209.967 28.16 209.578 28.5487 209.079 28.842C208.595 29.1207 208.038 29.26 207.407 29.26H194.999C194.369 29.26 193.811 29.1207 193.327 28.842C192.829 28.5487 192.44 28.16 192.161 27.676C191.868 27.1773 191.721 26.6127 191.721 25.982V25.938ZM204.075 25.938C204.075 25.3073 204.222 24.75 204.515 24.266C204.794 23.7673 205.182 23.3787 205.681 23.1C206.165 22.8067 206.722 22.66 207.353 22.66H219.761C220.392 22.66 220.949 22.8067 221.433 23.1C221.932 23.3787 222.32 23.7673 222.599 24.266C222.892 24.75 223.039 25.3073 223.039 25.938V25.982C223.039 26.6127 222.892 27.1773 222.599 27.676C222.32 28.16 221.932 28.5487 221.433 28.842C220.949 29.1207 220.392 29.26 219.761 29.26H207.353C206.722 29.26 206.165 29.1207 205.681 28.842C205.182 28.5487 204.794 28.16 204.515 27.676C204.222 27.1773 204.075 26.6127 204.075 25.982V25.938ZM216.429 25.938C216.429 25.3073 216.575 24.75 216.869 24.266C217.147 23.7673 217.536 23.3787 218.035 23.1C218.519 22.8067 219.076 22.66 219.707 22.66H226.043C226.673 22.66 227.231 22.8067 227.715 23.1C228.213 23.3787 228.602 23.7673 228.881 24.266C229.174 24.75 229.321 25.3073 229.321 25.938V25.982C229.321 26.6127 229.174 27.1773 228.881 27.676C228.602 28.16 228.213 28.5487 227.715 28.842C227.231 29.1207 226.673 29.26 226.043 29.26H219.707C219.076 29.26 218.519 29.1207 218.035 28.842C217.536 28.5487 217.147 28.16 216.869 27.676C216.575 27.1773 216.429 26.6127 216.429 25.982V25.938ZM222.723 25.938C222.723 25.3073 222.87 24.75 223.163 24.266C223.442 23.7673 223.831 23.3787 224.329 23.1C224.813 22.8067 225.371 22.66 226.001 22.66H232.337C232.968 22.66 233.525 22.8067 234.009 23.1C234.508 23.3787 234.897 23.7673 235.175 24.266C235.469 24.75 235.615 25.3073 235.615 25.938V25.982C235.615 26.6127 235.469 27.1773 235.175 27.676C234.897 28.16 234.508 28.5487 234.009 28.842C233.525 29.1207 232.968 29.26 232.337 29.26H226.001C225.371 29.26 224.813 29.1207 224.329 28.842C223.831 28.5487 223.442 28.16 223.163 27.676C222.87 27.1773 222.723 26.6127 222.723 25.982V25.938ZM229.018 25.938C229.018 25.3073 229.165 24.75 229.458 24.266C229.737 23.7673 230.126 23.3787 230.624 23.1C231.108 22.8067 231.666 22.66 232.296 22.66H238.632C239.263 22.66 239.82 22.8067 240.304 23.1C240.803 23.3787 241.192 23.7673 241.47 24.266C241.764 24.75 241.91 25.3073 241.91 25.938V25.982C241.91 26.6127 241.764 27.1773 241.47 27.676C241.192 28.16 240.803 28.5487 240.304 28.842C239.82 29.1207 239.263 29.26 238.632 29.26H232.296C231.666 29.26 231.108 29.1207 230.624 28.842C230.126 28.5487 229.737 28.16 229.458 27.676C229.165 27.1773 229.018 26.6127 229.018 25.982V25.938Z" fill="#F0F2F5"/>
+<rect x="8" y="56" width="32" height="32" rx="16" fill="#E1E6EC"/>
+<mask id="path-6-inside-2_1772_38931" fill="white">
+<path d="M52 48H309V96H52V48Z"/>
+</mask>
+<path d="M309 96V95.5H52V96V96.5H309V96Z" fill="#F0F2F5" mask="url(#path-6-inside-2_1772_38931)"/>
+<path d="M48.7 73.938C48.7 73.3073 48.8467 72.75 49.14 72.266C49.4187 71.7673 49.8073 71.3787 50.306 71.1C50.79 70.8067 51.3473 70.66 51.978 70.66H64.386C65.0167 70.66 65.574 70.8067 66.058 71.1C66.5567 71.3787 66.9453 71.7673 67.224 72.266C67.5173 72.75 67.664 73.3073 67.664 73.938V73.982C67.664 74.6127 67.5173 75.1773 67.224 75.676C66.9453 76.16 66.5567 76.5487 66.058 76.842C65.574 77.1207 65.0167 77.26 64.386 77.26H51.978C51.3473 77.26 50.79 77.1207 50.306 76.842C49.8073 76.5487 49.4187 76.16 49.14 75.676C48.8467 75.1773 48.7 74.6127 48.7 73.982V73.938ZM61.0535 73.938C61.0535 73.3073 61.2002 72.75 61.4935 72.266C61.7722 71.7673 62.1608 71.3787 62.6595 71.1C63.1435 70.8067 63.7008 70.66 64.3315 70.66H76.7395C77.3702 70.66 77.9275 70.8067 78.4115 71.1C78.9102 71.3787 79.2988 71.7673 79.5775 72.266C79.8708 72.75 80.0175 73.3073 80.0175 73.938V73.982C80.0175 74.6127 79.8708 75.1773 79.5775 75.676C79.2988 76.16 78.9102 76.5487 78.4115 76.842C77.9275 77.1207 77.3702 77.26 76.7395 77.26H64.3315C63.7008 77.26 63.1435 77.1207 62.6595 76.842C62.1608 76.5487 61.7722 76.16 61.4935 75.676C61.2002 75.1773 61.0535 74.6127 61.0535 73.982V73.938ZM73.407 73.938C73.407 73.3073 73.5537 72.75 73.847 72.266C74.1257 71.7673 74.5144 71.3787 75.013 71.1C75.497 70.8067 76.0544 70.66 76.685 70.66H89.093C89.7237 70.66 90.281 70.8067 90.765 71.1C91.2637 71.3787 91.6524 71.7673 91.931 72.266C92.2244 72.75 92.371 73.3073 92.371 73.938V73.982C92.371 74.6127 92.2244 75.1773 91.931 75.676C91.6524 76.16 91.2637 76.5487 90.765 76.842C90.281 77.1207 89.7237 77.26 89.093 77.26H76.685C76.0544 77.26 75.497 77.1207 75.013 76.842C74.5144 76.5487 74.1257 76.16 73.847 75.676C73.5537 75.1773 73.407 74.6127 73.407 73.982V73.938ZM85.7605 73.938C85.7605 73.3073 85.9072 72.75 86.2005 72.266C86.4792 71.7673 86.8679 71.3787 87.3665 71.1C87.8505 70.8067 88.4079 70.66 89.0385 70.66H101.447C102.077 70.66 102.635 70.8067 103.119 71.1C103.617 71.3787 104.006 71.7673 104.285 72.266C104.578 72.75 104.725 73.3073 104.725 73.938V73.982C104.725 74.6127 104.578 75.1773 104.285 75.676C104.006 76.16 103.617 76.5487 103.119 76.842C102.635 77.1207 102.077 77.26 101.447 77.26H89.0385C88.4079 77.26 87.8505 77.1207 87.3665 76.842C86.8679 76.5487 86.4792 76.16 86.2005 75.676C85.9072 75.1773 85.7605 74.6127 85.7605 73.982V73.938ZM111.305 73.938C111.305 73.3073 111.452 72.75 111.745 72.266C112.024 71.7673 112.413 71.3787 112.911 71.1C113.395 70.8067 113.953 70.66 114.583 70.66H126.991C127.622 70.66 128.179 70.8067 128.663 71.1C129.162 71.3787 129.551 71.7673 129.829 72.266C130.123 72.75 130.269 73.3073 130.269 73.938V73.982C130.269 74.6127 130.123 75.1773 129.829 75.676C129.551 76.16 129.162 76.5487 128.663 76.842C128.179 77.1207 127.622 77.26 126.991 77.26H114.583C113.953 77.26 113.395 77.1207 112.911 76.842C112.413 76.5487 112.024 76.16 111.745 75.676C111.452 75.1773 111.305 74.6127 111.305 73.982V73.938ZM123.659 73.938C123.659 73.3073 123.806 72.75 124.099 72.266C124.378 71.7673 124.766 71.3787 125.265 71.1C125.749 70.8067 126.306 70.66 126.937 70.66H133.273C133.904 70.66 134.461 70.8067 134.945 71.1C135.444 71.3787 135.832 71.7673 136.111 72.266C136.404 72.75 136.551 73.3073 136.551 73.938V73.982C136.551 74.6127 136.404 75.1773 136.111 75.676C135.832 76.16 135.444 76.5487 134.945 76.842C134.461 77.1207 133.904 77.26 133.273 77.26H126.937C126.306 77.26 125.749 77.1207 125.265 76.842C124.766 76.5487 124.378 76.16 124.099 75.676C123.806 75.1773 123.659 74.6127 123.659 73.982V73.938ZM129.954 73.938C129.954 73.3073 130.101 72.75 130.394 72.266C130.673 71.7673 131.061 71.3787 131.56 71.1C132.044 70.8067 132.601 70.66 133.232 70.66H145.64C146.271 70.66 146.828 70.8067 147.312 71.1C147.811 71.3787 148.199 71.7673 148.478 72.266C148.771 72.75 148.918 73.3073 148.918 73.938V73.982C148.918 74.6127 148.771 75.1773 148.478 75.676C148.199 76.16 147.811 76.5487 147.312 76.842C146.828 77.1207 146.271 77.26 145.64 77.26H133.232C132.601 77.26 132.044 77.1207 131.56 76.842C131.061 76.5487 130.673 76.16 130.394 75.676C130.101 75.1773 129.954 74.6127 129.954 73.982V73.938ZM142.307 73.938C142.307 73.3073 142.454 72.75 142.747 72.266C143.026 71.7673 143.415 71.3787 143.913 71.1C144.397 70.8067 144.955 70.66 145.585 70.66H157.993C158.624 70.66 159.181 70.8067 159.665 71.1C160.164 71.3787 160.553 71.7673 160.831 72.266C161.125 72.75 161.271 73.3073 161.271 73.938V73.982C161.271 74.6127 161.125 75.1773 160.831 75.676C160.553 76.16 160.164 76.5487 159.665 76.842C159.181 77.1207 158.624 77.26 157.993 77.26H145.585C144.955 77.26 144.397 77.1207 143.913 76.842C143.415 76.5487 143.026 76.16 142.747 75.676C142.454 75.1773 142.307 74.6127 142.307 73.982V73.938ZM154.661 73.938C154.661 73.3073 154.808 72.75 155.101 72.266C155.38 71.7673 155.768 71.3787 156.267 71.1C156.751 70.8067 157.308 70.66 157.939 70.66H170.347C170.978 70.66 171.535 70.8067 172.019 71.1C172.518 71.3787 172.906 71.7673 173.185 72.266C173.478 72.75 173.625 73.3073 173.625 73.938V73.982C173.625 74.6127 173.478 75.1773 173.185 75.676C172.906 76.16 172.518 76.5487 172.019 76.842C171.535 77.1207 170.978 77.26 170.347 77.26H157.939C157.308 77.26 156.751 77.1207 156.267 76.842C155.768 76.5487 155.38 76.16 155.101 75.676C154.808 75.1773 154.661 74.6127 154.661 73.982V73.938ZM167.014 73.938C167.014 73.3073 167.161 72.75 167.454 72.266C167.733 71.7673 168.122 71.3787 168.62 71.1C169.104 70.8067 169.662 70.66 170.292 70.66H176.628C177.259 70.66 177.816 70.8067 178.3 71.1C178.799 71.3787 179.188 71.7673 179.466 72.266C179.76 72.75 179.906 73.3073 179.906 73.938V73.982C179.906 74.6127 179.76 75.1773 179.466 75.676C179.188 76.16 178.799 76.5487 178.3 76.842C177.816 77.1207 177.259 77.26 176.628 77.26H170.292C169.662 77.26 169.104 77.1207 168.62 76.842C168.122 76.5487 167.733 76.16 167.454 75.676C167.161 75.1773 167.014 74.6127 167.014 73.982V73.938ZM173.309 73.938C173.309 73.3073 173.456 72.75 173.749 72.266C174.028 71.7673 174.417 71.3787 174.915 71.1C175.399 70.8067 175.957 70.66 176.587 70.66H182.923C183.554 70.66 184.111 70.8067 184.595 71.1C185.094 71.3787 185.483 71.7673 185.761 72.266C186.055 72.75 186.201 73.3073 186.201 73.938V73.982C186.201 74.6127 186.055 75.1773 185.761 75.676C185.483 76.16 185.094 76.5487 184.595 76.842C184.111 77.1207 183.554 77.26 182.923 77.26H176.587C175.957 77.26 175.399 77.1207 174.915 76.842C174.417 76.5487 174.028 76.16 173.749 75.676C173.456 75.1773 173.309 74.6127 173.309 73.982V73.938ZM179.604 73.938C179.604 73.3073 179.751 72.75 180.044 72.266C180.323 71.7673 180.712 71.3787 181.21 71.1C181.694 70.8067 182.252 70.66 182.882 70.66H189.218C189.849 70.66 190.406 70.8067 190.89 71.1C191.389 71.3787 191.778 71.7673 192.056 72.266C192.35 72.75 192.496 73.3073 192.496 73.938V73.982C192.496 74.6127 192.35 75.1773 192.056 75.676C191.778 76.16 191.389 76.5487 190.89 76.842C190.406 77.1207 189.849 77.26 189.218 77.26H182.882C182.252 77.26 181.694 77.1207 181.21 76.842C180.712 76.5487 180.323 76.16 180.044 75.676C179.751 75.1773 179.604 74.6127 179.604 73.982V73.938Z" fill="#F0F2F5"/>
+</svg>
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 213c641440..94774bc5b8 100644
--- a/res/themes/light-high-contrast/css/_light-high-contrast.pcss
+++ b/res/themes/light-high-contrast/css/_light-high-contrast.pcss
@@ -163,7 +163,8 @@ $accent-1400: var(--cpd-color-green-1400);
                     &.mx_SpotlightDialog_startChat::before,
                     &.mx_SpotlightDialog_joinRoomAlias::before,
                     &.mx_SpotlightDialog_explorePublicRooms::before,
-                    &.mx_SpotlightDialog_startGroupChat::before {
+                    &.mx_SpotlightDialog_startGroupChat::before,
+                    &.mx_SpotlightDialog_searchMessages::before {
                         background-color: $background !important;
                     }
 
diff --git a/res/welcome.html b/res/welcome.html
index ef2d43bd8f..9fdd60a7c0 100644
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -3,7 +3,7 @@
  * voodoo where we have to set display: none by default
  */
 
-    h1::after {
+    .mx_Header_title::after {
         content: "!";
     }
 
diff --git a/scripts/docker-package.sh b/scripts/docker-package.sh
index 0920587117..14444de556 100755
--- a/scripts/docker-package.sh
+++ b/scripts/docker-package.sh
@@ -3,7 +3,6 @@
 set -ex
 
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
-DIST_VERSION=$(git describe --abbrev=0 --tags)
 
 DIR=$(dirname "$0")
 
@@ -13,6 +12,8 @@ DIR=$(dirname "$0")
 if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
 then
     DIST_VERSION=$("$DIR"/get-version-from-git.sh)
+else
+    DIST_VERSION=$(git describe --abbrev=0 --tags)
 fi
 
 DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION")
diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 3bbeda067b..d4ae6c897b 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -29,7 +29,6 @@ import type LegacyCallHandler from "../LegacyCallHandler";
 import type UserActivity from "../UserActivity";
 import { type ModalWidgetStore } from "../stores/ModalWidgetStore";
 import { type WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
-import type VoipUserMapper from "../VoipUserMapper";
 import { type SpaceStoreClass } from "../stores/spaces/SpaceStore";
 import type TypingStore from "../stores/TypingStore";
 import { type EventIndexPeg } from "../indexing/EventIndexPeg";
@@ -83,19 +82,10 @@ declare global {
         mxMatrixClientPeg: IMatrixClientPeg;
         mxReactSdkConfig: DeepReadonly<IConfigOptions>;
 
-        // Needed for Safari, unknown to TypeScript
-        webkitAudioContext: typeof AudioContext;
-
         // https://docs.microsoft.com/en-us/previous-versions/hh772328(v=vs.85)
         // we only ever check for its existence, so we can ignore its actual type
         MSStream?: unknown;
 
-        // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1029#issuecomment-869224737
-        // https://developer.mozilla.org/en-US/docs/Web/API/OffscreenCanvas
-        OffscreenCanvas?: {
-            new (width: number, height: number): OffscreenCanvas;
-        };
-
         mxContentMessages: ContentMessages;
         mxToastStore: ToastStore;
         mxDeviceListener: DeviceListener;
@@ -113,7 +103,6 @@ declare global {
         mxLegacyCallHandler: LegacyCallHandler;
         mxUserActivity: UserActivity;
         mxModalWidgetStore: ModalWidgetStore;
-        mxVoipUserMapper: VoipUserMapper;
         mxSpaceStore: SpaceStoreClass;
         mxVoiceRecordingStore: VoiceRecordingStore;
         mxTypingStore: TypingStore;
@@ -139,8 +128,19 @@ 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;
+            config: IConfigOptions;
+            supportedSettings: Record<string, boolean>;
+        }>;
+        // Settings
+        setSettingValue(settingName: string, value: any): Promise<void>;
+        getSettingValue(settingName: string): Promise<any>;
     }
 
     interface DesktopCapturerSource {
@@ -158,31 +158,10 @@ declare global {
         fetchWindowIcons?: boolean;
     }
 
-    interface Document {
-        // Safari & IE11 only have this prefixed: we used prefixed versions
-        // previously so let's continue to support them for now
-        webkitExitFullscreen(): Promise<void>;
-        msExitFullscreen(): Promise<void>;
-        readonly webkitFullscreenElement: Element | null;
-        readonly msFullscreenElement: Element | null;
-    }
-
-    interface Navigator {
-        userLanguage?: string;
-    }
-
     interface StorageEstimate {
         usageDetails?: { [key: string]: number };
     }
 
-    interface Element {
-        // Safari & IE11 only have this prefixed: we used prefixed versions
-        // previously so let's continue to support them for now
-        webkitRequestFullScreen(options?: FullscreenOptions): Promise<void>;
-        msRequestFullscreen(options?: FullscreenOptions): Promise<void>;
-        // scrollIntoView(arg?: boolean | _ScrollIntoViewOptions): void;
-    }
-
     // https://github.com/microsoft/TypeScript/issues/28308#issuecomment-650802278
     interface AudioWorkletProcessor {
         readonly port: MessagePort;
@@ -241,11 +220,4 @@ declare global {
     var mx_rage_store: IndexedDBLogStore;
 }
 
-// add method which is missing from the node typing
-declare module "url" {
-    interface Url {
-        format(): string;
-    }
-}
-
 /* eslint-enable @typescript-eslint/naming-convention */
diff --git a/src/@types/invite-rules.ts b/src/@types/invite-rules.ts
new file mode 100644
index 0000000000..bc72a5e922
--- /dev/null
+++ b/src/@types/invite-rules.ts
@@ -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.
+*/
+
+export const INVITE_RULES_ACCOUNT_DATA_TYPE = "org.matrix.msc4155.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 92b76c4c4d..e1f8c4562e 100644
--- a/src/@types/matrix-js-sdk.d.ts
+++ b/src/@types/matrix-js-sdk.d.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 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
@@ -14,6 +14,8 @@ import type { EncryptedFile } from "matrix-js-sdk/src/types";
 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 } 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" {
@@ -59,7 +61,6 @@ declare module "matrix-js-sdk/src/types" {
             };
         };
     }
-
     export interface AccountDataEvents {
         // Analytics account data event
         "im.vector.analytics": {
@@ -87,6 +88,10 @@ declare module "matrix-js-sdk/src/types" {
         "m.accepted_terms": {
             accepted: string[];
         };
+
+        // MSC4155: Invite filtering
+        [INVITE_RULES_ACCOUNT_DATA_TYPE]: InviteConfigAccountData;
+        "io.element.msc4278.media_preview_config": MediaPreviewConfig;
     }
 
     export interface AudioContent {
diff --git a/src/@types/media_preview.ts b/src/@types/media_preview.ts
new file mode 100644
index 0000000000..d340e64caf
--- /dev/null
+++ b/src/@types/media_preview.ts
@@ -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.
+*/
+
+export enum MediaPreviewValue {
+    /**
+     * Media previews should be enabled.
+     */
+    On = "on",
+    /**
+     * Media previews should only be enabled for rooms with non-public join rules.
+     */
+    Private = "private",
+    /**
+     * Media previews should be disabled.
+     */
+    Off = "off",
+}
+
+export const MEDIA_PREVIEW_ACCOUNT_DATA_TYPE = "io.element.msc4278.media_preview_config";
+export interface MediaPreviewConfig extends Record<string, unknown> {
+    /**
+     * Media preview setting for thumbnails of media in rooms.
+     */
+    media_previews: MediaPreviewValue;
+    /**
+     * Media preview settings for avatars of rooms we have been invited to.
+     */
+    invite_avatars: MediaPreviewValue.On | MediaPreviewValue.Off;
+}
diff --git a/src/@types/react.d.ts b/src/@types/react.d.ts
index d66c22e56f..61a4c59992 100644
--- a/src/@types/react.d.ts
+++ b/src/@types/react.d.ts
@@ -6,16 +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 PropsWithChildren } from "react";
-
-import type React from "react";
+import { type ComponentType } from "react";
 
 declare module "react" {
-    // Fix forwardRef types for Generic components - https://stackoverflow.com/a/58473012
-    function forwardRef<T, P extends object>(
-        render: (props: PropsWithChildren<P>, ref: React.ForwardedRef<T>) => React.ReactElement | null,
-    ): (props: P & React.RefAttributes<T>) => React.ReactElement | null;
-
     // Fix lazy types - https://stackoverflow.com/a/71017028
     function lazy<T extends ComponentType<any>>(factory: () => Promise<{ default: T }>): T;
+
+    // Standardize defaultProps for FunctionComponent so we can write generics assuming `defaultProps` exists on ComponentType
+    interface FunctionComponent {
+        defaultProps?: unknown;
+    }
 }
diff --git a/src/AddThreepid.ts b/src/AddThreepid.ts
index 7d2c4cefb5..877a0c5c4a 100644
--- a/src/AddThreepid.ts
+++ b/src/AddThreepid.ts
@@ -79,6 +79,8 @@ export default class AddThreepid {
         } catch (err) {
             if (err instanceof MatrixError && err.errcode === "M_THREEPID_IN_USE") {
                 throw new UserFriendlyError("settings|general|email_address_in_use", { cause: err });
+            } else if (err instanceof MatrixError && err.errcode === "M_THREEPID_MEDIUM_NOT_SUPPORTED") {
+                throw new UserFriendlyError("settings|general|email_adding_unsupported_by_hs", { cause: err });
             }
             // Otherwise, just blurt out the same error
             throw err;
@@ -121,6 +123,8 @@ export default class AddThreepid {
      * @param {string} phoneCountry The ISO 2 letter code of the country to resolve phoneNumber in
      * @param {string} phoneNumber The national or international formatted phone number to add
      * @return {Promise} Resolves when the text message has been sent. Then call haveMsisdnToken().
+     *
+     * @throws {UserFriendlyError} An appropriate user-friendly error if the verification code could not be sent.
      */
     public async addMsisdn(phoneCountry: string, phoneNumber: string): Promise<IRequestMsisdnTokenResponse> {
         try {
@@ -136,6 +140,10 @@ export default class AddThreepid {
         } catch (err) {
             if (err instanceof MatrixError && err.errcode === "M_THREEPID_IN_USE") {
                 throw new UserFriendlyError("settings|general|msisdn_in_use", { cause: err });
+            } else if (err instanceof MatrixError && err.errcode === "M_THREEPID_MEDIUM_NOT_SUPPORTED") {
+                throw new UserFriendlyError("settings|general|msisdn_adding_unsupported_by_hs", { cause: err });
+            } else if (err instanceof MatrixError && err.errcode === "M_INVALID_PARAM") {
+                throw new UserFriendlyError("settings|general|invalid_phone_number", { cause: err });
             }
             // Otherwise, just blurt out the same error
             throw err;
diff --git a/src/Avatar.ts b/src/Avatar.ts
index abddfd87f1..921332c250 100644
--- a/src/Avatar.ts
+++ b/src/Avatar.ts
@@ -147,11 +147,12 @@ export function avatarUrlForRoom(
     width?: number,
     height?: number,
     resizeMethod?: ResizeMethod,
+    avatarMxcOverride?: string,
 ): string | null {
     if (!room) return null; // null-guard
-
-    if (room.getMxcAvatarUrl()) {
-        const media = mediaFromMxc(room.getMxcAvatarUrl() ?? undefined);
+    const mxc = avatarMxcOverride ?? room.getMxcAvatarUrl();
+    if (mxc) {
+        const media = mediaFromMxc(mxc);
         if (width !== undefined && height !== undefined) {
             return media.getThumbnailOfSourceHttp(width, height, resizeMethod);
         }
diff --git a/src/BasePlatform.ts b/src/BasePlatform.ts
index c7b7825fe6..87635a421c 100644
--- a/src/BasePlatform.ts
+++ b/src/BasePlatform.ts
@@ -72,7 +72,7 @@ export default abstract class BasePlatform {
     protected _favicon?: Favicon;
 
     protected constructor() {
-        dis.register(this.onAction);
+        dis.register(this.onAction.bind(this));
         this.startUpdateCheck = this.startUpdateCheck.bind(this);
     }
 
@@ -85,14 +85,14 @@ export default abstract class BasePlatform {
      */
     public abstract getDefaultDeviceDisplayName(): string;
 
-    protected onAction = (payload: ActionPayload): void => {
+    protected onAction(payload: ActionPayload): void {
         switch (payload.action) {
             case "on_client_not_viable":
             case Action.OnLoggedOut:
                 this.setNotificationCount(0);
                 break;
         }
-    };
+    }
 
     // Used primarily for Analytics
     public abstract getHumanReadableName(): string;
diff --git a/src/ContentMessages.ts b/src/ContentMessages.ts
index c5e34d7130..54aaea3ae1 100644
--- a/src/ContentMessages.ts
+++ b/src/ContentMessages.ts
@@ -63,6 +63,7 @@ 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 {}
 
 interface IMediaConfig {
     "m.upload.size"?: number;
@@ -355,12 +356,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();
+        }
         if (abortController.signal.aborted) throw new UploadCanceledError();
 
         // If the attachment is encrypted then bundle the URL along with the information
@@ -372,7 +380,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();
+        }
         if (abortController.signal.aborted) throw new UploadCanceledError();
         // If the attachment isn't encrypted then include the URL directly.
         return { url };
@@ -570,7 +585,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;
                     }
diff --git a/src/CreateCrossSigning.ts b/src/CreateCrossSigning.ts
index db9bc3e3fe..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
@@ -64,7 +64,7 @@ export async function uiAuthCallback(
         };
 
         const { finished } = Modal.createDialog(InteractiveAuthDialog, {
-            title: _t("encryption|bootstrap_title"),
+            title: "",
             matrixClient,
             makeRequest,
             aestheticsForStagePhases: {
diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 751e71dd9f..e13d296bc1 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -97,6 +97,7 @@ export default class DeviceListener {
         this.client.on(CryptoEvent.DevicesUpdated, this.onDevicesUpdated);
         this.client.on(CryptoEvent.UserTrustStatusChanged, this.onUserTrustStatusChanged);
         this.client.on(CryptoEvent.KeysChanged, this.onCrossSingingKeysChanged);
+        this.client.on(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatusChanged);
         this.client.on(ClientEvent.AccountData, this.onAccountData);
         this.client.on(ClientEvent.Sync, this.onSync);
         this.client.on(RoomStateEvent.Events, this.onRoomStateEvents);
@@ -132,7 +133,7 @@ export default class DeviceListener {
         this.dismissedThisDeviceToast = false;
         this.keyBackupInfo = null;
         this.keyBackupFetchedAt = null;
-        this.keyBackupStatusChecked = false;
+        this.cachedKeyBackupUploadActive = undefined;
         this.ourDeviceIdsAtStart = null;
         this.displayingToastsForDeviceIds = new Set();
         this.client = undefined;
@@ -157,6 +158,13 @@ export default class DeviceListener {
         this.recheck();
     }
 
+    /**
+     * Set the account data "m.org.matrix.custom.backup_disabled" to { "disabled": true }.
+     */
+    public async recordKeyBackupDisabled(): Promise<void> {
+        await this.client?.setAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY, { disabled: true });
+    }
+
     private async ensureDeviceIdsAtStartPopulated(): Promise<void> {
         if (this.ourDeviceIdsAtStart === null) {
             this.ourDeviceIdsAtStart = await this.getDeviceIds();
@@ -192,6 +200,11 @@ export default class DeviceListener {
         this.recheck();
     };
 
+    private onKeyBackupStatusChanged = (): void => {
+        this.cachedKeyBackupUploadActive = undefined;
+        this.recheck();
+    };
+
     private onCrossSingingKeysChanged = (): void => {
         this.recheck();
     };
@@ -201,11 +214,13 @@ export default class DeviceListener {
         // * migrated SSSS to symmetric
         // * uploaded keys to secret storage
         // * completed secret storage creation
+        // * disabled key backup
         // which result in account data changes affecting checks below.
         if (
             ev.getType().startsWith("m.secret_storage.") ||
             ev.getType().startsWith("m.cross_signing.") ||
-            ev.getType() === "m.megolm_backup.v1"
+            ev.getType() === "m.megolm_backup.v1" ||
+            ev.getType() === BACKUP_DISABLED_ACCOUNT_DATA_KEY
         ) {
             this.recheck();
         }
@@ -324,7 +339,16 @@ export default class DeviceListener {
                 (await crypto.getDeviceVerificationStatus(cli.getSafeUserId(), cli.deviceId!))?.crossSigningVerified,
             );
 
-        const allSystemsReady = crossSigningReady && secretStorageReady && allCrossSigningSecretsCached;
+        const keyBackupUploadActive = await this.isKeyBackupUploadActive();
+        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 allSystemsReady =
+            crossSigningReady && keyBackupIsOk && secretStorageReady && allCrossSigningSecretsCached;
+
         await this.reportCryptoSessionStateToAnalytics(cli);
 
         if (this.dismissedThisDeviceToast || allSystemsReady) {
@@ -353,14 +377,19 @@ export default class DeviceListener {
                     crossSigningStatus.privateKeysCachedLocally,
                 );
                 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) {
-                // the user just hasn't set up 4S yet: prompt them to do so (unless they've explicitly said no to key storage)
-                const disabledEvent = cli.getAccountData(BACKUP_DISABLED_ACCOUNT_DATA_KEY);
-                if (!disabledEvent?.getContent().disabled) {
+                // 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);
                 } else {
                     logSpan.info("No default 4S key but backup disabled: no toast needed");
+                    hideSetupEncryptionToast();
                 }
             } else {
                 // some other condition... yikes! Show the 'set up encryption' toast: this is what we previously did
@@ -443,6 +472,16 @@ export default class DeviceListener {
         this.displayingToastsForDeviceIds = newUnverifiedDeviceIds;
     }
 
+    /**
+     * Fetch the account data for `backup_disabled`. 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 recheckBackupDisabled(cli: MatrixClient): Promise<boolean> {
+        const backupDisabled = await cli.getAccountDataFromServer(BACKUP_DISABLED_ACCOUNT_DATA_KEY);
+        return !!backupDisabled?.disabled;
+    }
+
     /**
      * 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).
@@ -512,18 +551,42 @@ export default class DeviceListener {
      * trigger an auto-rageshake).
      */
     private checkKeyBackupStatus = async (): Promise<void> => {
-        if (this.keyBackupStatusChecked || !this.client) {
-            return;
-        }
-        const activeKeyBackupVersion = await this.client.getCrypto()?.getActiveSessionBackupVersion();
-        // if key backup is enabled, no need to check this ever again (XXX: why only when it is enabled?)
-        this.keyBackupStatusChecked = !!activeKeyBackupVersion;
-
-        if (!activeKeyBackupVersion) {
+        if (!(await this.isKeyBackupUploadActive())) {
             dis.dispatch({ action: Action.ReportKeyBackupNotEnabled });
         }
     };
-    private keyBackupStatusChecked = false;
+
+    /**
+     * Is key backup enabled? Use a cached answer if we have one.
+     */
+    private isKeyBackupUploadActive = async (): Promise<boolean> => {
+        if (!this.client) {
+            // To preserve existing behaviour, if there is no client, we
+            // pretend key backup upload is on.
+            //
+            // Someone looking to improve this code could try throwing an error
+            // here since we don't expect client to be undefined.
+            return true;
+        }
+
+        const crypto = this.client.getCrypto();
+        if (!crypto) {
+            // If there is no crypto, there is no key backup
+            return false;
+        }
+
+        // If we've already cached the answer, return it.
+        if (this.cachedKeyBackupUploadActive !== undefined) {
+            return this.cachedKeyBackupUploadActive;
+        }
+
+        // Fetch the answer and cache it
+        const activeKeyBackupVersion = await crypto.getActiveSessionBackupVersion();
+        this.cachedKeyBackupUploadActive = !!activeKeyBackupVersion;
+
+        return this.cachedKeyBackupUploadActive;
+    };
+    private cachedKeyBackupUploadActive: boolean | undefined = undefined;
 
     private onRecordClientInformationSettingChange: CallbackFn = (
         _originalSettingName,
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index 5bc20095f3..1d17710dab 100644
--- a/src/HtmlUtils.tsx
+++ b/src/HtmlUtils.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 Copyright 2019 The Matrix.org Foundation C.I.C.
 Copyright 2017, 2018 New Vector Ltd
@@ -9,7 +9,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 LegacyRef, type ReactNode } from "react";
+import React, { type JSX, type Key, type LegacyRef, type ReactNode } from "react";
 import sanitizeHtml, { type IOptions } from "sanitize-html";
 import classNames from "classnames";
 import katex from "katex";
@@ -239,7 +239,7 @@ class HtmlHighlighter extends BaseHighlighter<string> {
 
 const emojiToHtmlSpan = (emoji: string): string =>
     `<span class='mx_Emoji' title='${unicodeToShortcode(emoji)}'>${emoji}</span>`;
-const emojiToJsxSpan = (emoji: string, key: number): JSX.Element => (
+const emojiToJsxSpan = (emoji: string, key: Key): JSX.Element => (
     <span key={key} className="mx_Emoji" title={unicodeToShortcode(emoji)}>
         {emoji}
     </span>
@@ -294,6 +294,10 @@ export interface EventRenderOpts {
     disableBigEmoji?: boolean;
     stripReplyFallback?: boolean;
     forComposerQuote?: boolean;
+    /**
+     * Should inline media be rendered?
+     */
+    mediaIsVisible?: boolean;
 }
 
 function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: EventRenderOpts = {}): EventAnalysis {
@@ -302,6 +306,20 @@ function analyseEvent(content: IContent, highlights: Optional<string[]>, opts: E
         sanitizeParams = composerSanitizeHtmlParams;
     }
 
+    if (opts.mediaIsVisible === false && sanitizeParams.transformTags?.["img"]) {
+        // Prevent mutating the source of sanitizeParams.
+        sanitizeParams = {
+            ...sanitizeParams,
+            transformTags: {
+                ...sanitizeParams.transformTags,
+                img: (tagName) => {
+                    // Remove element
+                    return { tagName, attribs: {} };
+                },
+            },
+        };
+    }
+
     try {
         const isFormattedBody =
             content.format === "org.matrix.custom.html" && typeof content.formatted_body === "string";
@@ -462,10 +480,6 @@ export function topicToHtml(
     ref?: LegacyRef<HTMLSpanElement>,
     allowExtendedHtml = false,
 ): ReactNode {
-    if (!SettingsStore.getValue("feature_html_topic")) {
-        htmlTopic = undefined;
-    }
-
     let isFormattedTopic = !!htmlTopic;
     let topicHasEmoji = false;
     let safeTopic = "";
diff --git a/src/LegacyCallHandler.tsx b/src/LegacyCallHandler.tsx
index 608d396dda..9c3e7073d5 100644
--- a/src/LegacyCallHandler.tsx
+++ b/src/LegacyCallHandler.tsx
@@ -39,14 +39,12 @@ import { WidgetMessagingStore } from "./stores/widgets/WidgetMessagingStore";
 import { ElementWidgetActions } from "./stores/widgets/ElementWidgetActions";
 import { UIFeature } from "./settings/UIFeature";
 import { Action } from "./dispatcher/actions";
-import VoipUserMapper from "./VoipUserMapper";
 import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from "./widgets/ManagedHybrid";
 import SdkConfig from "./SdkConfig";
 import { ensureDMExists } from "./createRoom";
 import { Container, WidgetLayoutStore } from "./stores/widgets/WidgetLayoutStore";
 import IncomingLegacyCallToast, { getIncomingLegacyCallToastKey } from "./toasts/IncomingLegacyCallToast";
 import ToastStore from "./stores/ToastStore";
-import Resend from "./Resend";
 import { type ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
 import { InviteKind } from "./components/views/dialogs/InviteDialogTypes";
 import { type OpenInviteDialogPayload } from "./dispatcher/payloads/OpenInviteDialogPayload";
@@ -59,8 +57,6 @@ import { Jitsi } from "./widgets/Jitsi.ts";
 
 export const PROTOCOL_PSTN = "m.protocol.pstn";
 export const PROTOCOL_PSTN_PREFIXED = "im.vector.protocol.pstn";
-export const PROTOCOL_SIP_NATIVE = "im.vector.protocol.sip_native";
-export const PROTOCOL_SIP_VIRTUAL = "im.vector.protocol.sip_virtual";
 
 const CHECK_PROTOCOLS_ATTEMPTS = 3;
 
@@ -107,27 +103,9 @@ const debuglog = (...args: any[]): void => {
     }
 };
 
-interface ThirdpartyLookupResponseFields {
-    /* eslint-disable camelcase */
-
-    // im.vector.sip_native
-    virtual_mxid?: string;
-    is_virtual?: boolean;
-
-    // im.vector.sip_virtual
-    native_mxid?: string;
-    is_native?: boolean;
-
-    // common
-    lookup_success?: boolean;
-
-    /* eslint-enable camelcase */
-}
-
 interface ThirdpartyLookupResponse {
     userid: string;
     protocol: string;
-    fields: ThirdpartyLookupResponseFields;
 }
 
 export enum LegacyCallHandlerEvent {
@@ -158,7 +136,6 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
     private transferees = new Map<string, MatrixCall>(); // callId (target) -> call (transferee)
     private supportsPstnProtocol: boolean | null = null;
     private pstnSupportPrefixed: boolean | null = null; // True if the server only support the prefixed pstn protocol
-    private supportsSipNativeVirtual: boolean | null = null; // im.vector.protocol.sip_virtual and im.vector.protocol.sip_native
 
     // Map of the asserted identity users after we've looked them up using the API.
     // We need to be be able to determine the mapped room synchronously, so we
@@ -179,8 +156,7 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
     }
 
     /*
-     * Gets the user-facing room associated with a call (call.roomId may be the call "virtual room"
-     * if a voip_mxid_translate_pattern is set in the config)
+     * Gets the user-facing room associated with a call
      */
     public roomIdForCall(call?: MatrixCall): string | null {
         if (!call) return null;
@@ -195,7 +171,7 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
             }
         }
 
-        return VoipUserMapper.sharedInstance().nativeRoomForVirtualRoom(call.roomId) ?? call.roomId ?? null;
+        return call.roomId ?? null;
     }
 
     public start(): void {
@@ -278,12 +254,6 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
                 this.supportsPstnProtocol = null;
             }
 
-            if (protocols[PROTOCOL_SIP_NATIVE] !== undefined && protocols[PROTOCOL_SIP_VIRTUAL] !== undefined) {
-                this.supportsSipNativeVirtual = Boolean(
-                    protocols[PROTOCOL_SIP_NATIVE] && protocols[PROTOCOL_SIP_VIRTUAL],
-                );
-            }
-
             this.emit(LegacyCallHandlerEvent.ProtocolSupport);
         } catch (e) {
             if (maxTries === 1) {
@@ -305,10 +275,6 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
         return this.supportsPstnProtocol ?? false;
     }
 
-    public getSupportsVirtualRooms(): boolean | null {
-        return this.supportsSipNativeVirtual;
-    }
-
     public async pstnLookup(phoneNumber: string): Promise<ThirdpartyLookupResponse[]> {
         try {
             return await MatrixClientPeg.safeGet().getThirdpartyUser(
@@ -323,28 +289,6 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
         }
     }
 
-    public async sipVirtualLookup(nativeMxid: string): Promise<ThirdpartyLookupResponse[]> {
-        try {
-            return await MatrixClientPeg.safeGet().getThirdpartyUser(PROTOCOL_SIP_VIRTUAL, {
-                native_mxid: nativeMxid,
-            });
-        } catch (e) {
-            logger.warn("Failed to query SIP identity for user", e);
-            return Promise.resolve([]);
-        }
-    }
-
-    public async sipNativeLookup(virtualMxid: string): Promise<ThirdpartyLookupResponse[]> {
-        try {
-            return await MatrixClientPeg.safeGet().getThirdpartyUser(PROTOCOL_SIP_NATIVE, {
-                virtual_mxid: virtualMxid,
-            });
-        } catch (e) {
-            logger.warn("Failed to query identity for SIP user", e);
-            return Promise.resolve([]);
-        }
-    }
-
     private onCallIncoming = (call: MatrixCall): void => {
         // if the runtime env doesn't do VoIP, stop here.
         if (!MatrixClientPeg.get()?.supportsVoip()) {
@@ -537,24 +481,16 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
             }
 
             const newAssertedIdentity = call.getRemoteAssertedIdentity()?.id;
-            let newNativeAssertedIdentity = newAssertedIdentity;
-            if (newAssertedIdentity) {
-                const response = await this.sipNativeLookup(newAssertedIdentity);
-                if (response.length && response[0].fields.lookup_success) {
-                    newNativeAssertedIdentity = response[0].userid;
-                }
-            }
-            logger.log(`Asserted identity ${newAssertedIdentity} mapped to ${newNativeAssertedIdentity}`);
 
-            if (newNativeAssertedIdentity) {
-                this.assertedIdentityNativeUsers.set(call.callId, newNativeAssertedIdentity);
+            if (newAssertedIdentity) {
+                this.assertedIdentityNativeUsers.set(call.callId, newAssertedIdentity);
 
                 // If we don't already have a room with this user, make one. This will be slightly odd
                 // if they called us because we'll be inviting them, but there's not much we can do about
                 // this if we want the actual, native room to exist (which we do). This is why it's
                 // important to only obey asserted identity in trusted environments, since anyone you're
                 // on a call with can cause you to send a room invite to someone.
-                await ensureDMExists(MatrixClientPeg.safeGet(), newNativeAssertedIdentity);
+                await ensureDMExists(MatrixClientPeg.safeGet(), newAssertedIdentity);
 
                 const newMappedRoomId = this.roomIdForCall(call);
                 logger.log(`Old room ID: ${mappedRoomId}, new room ID: ${newMappedRoomId}`);
@@ -743,7 +679,7 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
 
     private showICEFallbackPrompt(): void {
         const cli = MatrixClientPeg.safeGet();
-        Modal.createDialog(
+        const { finished } = Modal.createDialog(
             QuestionDialog,
             {
                 title: _t("voip|misconfigured_server"),
@@ -767,13 +703,14 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
                     server: new URL(FALLBACK_ICE_SERVER).pathname,
                 }),
                 cancelButton: _t("action|ok"),
-                onFinished: (allow) => {
-                    SettingsStore.setValue("fallbackICEServerAllowed", null, SettingLevel.DEVICE, allow);
-                },
             },
             undefined,
             true,
         );
+
+        finished.then(([allow]) => {
+            SettingsStore.setValue("fallbackICEServerAllowed", null, SettingLevel.DEVICE, allow);
+        });
     }
 
     private showMediaCaptureError(call: MatrixCall): void {
@@ -810,24 +747,10 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
 
     private async placeMatrixCall(roomId: string, type: CallType, transferee?: MatrixCall): Promise<void> {
         const cli = MatrixClientPeg.safeGet();
-        const mappedRoomId = (await VoipUserMapper.sharedInstance().getOrCreateVirtualRoomForRoom(roomId)) || roomId;
-        logger.debug("Mapped real room " + roomId + " to room ID " + mappedRoomId);
-
-        // If we're using a virtual room nd there are any events pending, try to resend them,
-        // otherwise the call will fail and because its a virtual room, the user won't be able
-        // to see it to either retry or clear the pending events. There will only be call events
-        // in this queue, and since we're about to place a new call, they can only be events from
-        // previous calls that are probably stale by now, so just cancel them.
-        if (mappedRoomId !== roomId) {
-            const mappedRoom = cli.getRoom(mappedRoomId);
-            if (mappedRoom?.getPendingEvents().length) {
-                Resend.cancelUnsentEvents(mappedRoom);
-            }
-        }
 
         const timeUntilTurnCresExpire = cli.getTurnServersExpiry() - Date.now();
         logger.log("Current turn creds expire in " + timeUntilTurnCresExpire + " ms");
-        const call = cli.createCall(mappedRoomId)!;
+        const call = cli.createCall(roomId)!;
 
         try {
             this.addCallForRoom(roomId, call);
@@ -978,19 +901,7 @@ export default class LegacyCallHandler extends TypedEventEmitter<LegacyCallHandl
         }
         const userId = results[0].userid;
 
-        // Now check to see if this is a virtual user, in which case we should find the
-        // native user
-        let nativeUserId;
-        if (this.getSupportsVirtualRooms()) {
-            const nativeLookupResults = await this.sipNativeLookup(userId);
-            const lookupSuccess = nativeLookupResults.length > 0 && nativeLookupResults[0].fields.lookup_success;
-            nativeUserId = lookupSuccess ? nativeLookupResults[0].userid : userId;
-            logger.log("Looked up " + number + " to " + userId + " and mapped to native user " + nativeUserId);
-        } else {
-            nativeUserId = userId;
-        }
-
-        const roomId = await ensureDMExists(MatrixClientPeg.safeGet(), nativeUserId);
+        const roomId = await ensureDMExists(MatrixClientPeg.safeGet(), userId);
         if (!roomId) {
             throw new Error("Failed to ensure DM exists for dialing number");
         }
diff --git a/src/Lifecycle.ts b/src/Lifecycle.ts
index 8ac235f78a..5641f936ae 100644
--- a/src/Lifecycle.ts
+++ b/src/Lifecycle.ts
@@ -321,7 +321,7 @@ async function attemptOidcNativeLogin(queryParams: QueryDict): Promise<boolean>
     } catch (error) {
         logger.error("Failed to login via OIDC", error);
 
-        await onFailedDelegatedAuthLogin(getOidcErrorMessage(error as Error));
+        onFailedDelegatedAuthLogin(getOidcErrorMessage(error as Error));
         return false;
     }
 }
@@ -468,13 +468,16 @@ type TryAgainFunction = () => void;
  * @param description error description
  * @param tryAgain OPTIONAL function to call on try again button from error dialog
  */
-async function onFailedDelegatedAuthLogin(description: string | ReactNode, tryAgain?: TryAgainFunction): Promise<void> {
-    Modal.createDialog(ErrorDialog, {
+function onFailedDelegatedAuthLogin(description: string | ReactNode, tryAgain?: TryAgainFunction): void {
+    const { finished } = Modal.createDialog(ErrorDialog, {
         title: _t("auth|oidc|error_title"),
         description,
         button: _t("action|try_again"),
+    });
+
+    finished.then(([shouldTryAgain]) => {
         // if we have a tryAgain callback, call it the primary 'try again' button was clicked in the dialog
-        onFinished: tryAgain ? (shouldTryAgain?: boolean) => shouldTryAgain && tryAgain() : undefined,
+        if (shouldTryAgain) tryAgain?.();
     });
 }
 
@@ -701,6 +704,43 @@ export async function setLoggedIn(credentials: IMatrixClientCreds): Promise<Matr
     return doSetLoggedIn(credentials, true, true);
 }
 
+/**
+ * Hydrates an existing session by using the credentials provided. This will
+ * not clear any local storage, unlike setLoggedIn().
+ *
+ * Stops the existing Matrix client (without clearing its data) and starts a
+ * new one in its place. This additionally starts all other react-sdk services
+ * which use the new Matrix client.
+ *
+ * If the credentials belong to a different user from the session already stored,
+ * the old session will be cleared automatically.
+ *
+ * @param {IMatrixClientCreds} credentials The credentials to use
+ *
+ * @returns {Promise} promise which resolves to the new MatrixClient once it has been started
+ */
+export async function hydrateSession(credentials: IMatrixClientCreds): Promise<MatrixClient> {
+    const oldUserId = MatrixClientPeg.safeGet().getUserId();
+    const oldDeviceId = MatrixClientPeg.safeGet().getDeviceId();
+
+    stopMatrixClient(); // unsets MatrixClientPeg.get()
+    localStorage.removeItem("mx_soft_logout");
+    _isLoggingOut = false;
+
+    const overwrite = credentials.userId !== oldUserId || credentials.deviceId !== oldDeviceId;
+    if (overwrite) {
+        logger.warn("Clearing all data: Old session belongs to a different user/session");
+    }
+
+    if (!credentials.pickleKey && credentials.deviceId !== undefined) {
+        logger.info("Lifecycle#hydrateSession: Pickle key not provided - trying to get one");
+        credentials.pickleKey =
+            (await PlatformPeg.get()?.getPickleKey(credentials.userId, credentials.deviceId)) ?? undefined;
+    }
+
+    return doSetLoggedIn(credentials, overwrite, false);
+}
+
 /**
  * When we have a authenticated via OIDC-native flow and have a refresh token
  * try to create a token refresher.
@@ -1075,7 +1115,9 @@ export async function onLoggedOut(): Promise<void> {
  * @param {object} opts Options for how to clear storage.
  * @returns {Promise} promise which resolves once the stores have been cleared
  */
-async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void> {
+export async function clearStorage(opts?: { deleteEverything?: boolean }): Promise<void> {
+    logger.info(`Clearing storage, deleteEverything=${opts?.deleteEverything}`);
+
     if (window.localStorage) {
         // get the currently defined device language, if set, so we can restore it later
         const language = SettingsStore.getValueAt(SettingLevel.DEVICE, "language", null, true, true);
diff --git a/src/Linkify.tsx b/src/Linkify.tsx
index 27dd4783be..846bf8e82d 100644
--- a/src/Linkify.tsx
+++ b/src/Linkify.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 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
@@ -12,7 +12,6 @@ import { merge } from "lodash";
 import _Linkify from "linkify-react";
 
 import { _linkifyString, ELEMENT_URL_PATTERN, options as linkifyMatrixOptions } from "./linkify-matrix";
-import SettingsStore from "./settings/SettingsStore";
 import { tryTransformPermalinkToLocalHref } from "./utils/permalinks/Permalinks";
 import { mediaFromMxc } from "./customisations/Media";
 import { PERMITTED_URL_SCHEMES } from "./utils/UrlUtils";
@@ -47,10 +46,7 @@ export const transformTags: NonNullable<IOptions["transformTags"]> = {
         // Strip out imgs that aren't `mxc` here instead of using allowedSchemesByTag
         // because transformTags is used _before_ we filter by allowedSchemesByTag and
         // we don't want to allow images with `https?` `src`s.
-        // We also drop inline images (as if they were not present at all) when the "show
-        // images" preference is disabled. Future work might expose some UI to reveal them
-        // like standalone image events have.
-        if (!src || !SettingsStore.getValue("showImages")) {
+        if (!src) {
             return { tagName, attribs: {} };
         }
 
@@ -78,7 +74,6 @@ export const transformTags: NonNullable<IOptions["transformTags"]> = {
         if (requestedHeight) {
             attribs.style += "height: 100%;";
         }
-
         attribs.src = mediaFromMxc(src).getThumbnailOfSourceHttp(width, height)!;
         return { tagName, attribs };
     },
diff --git a/src/Modal.tsx b/src/Modal.tsx
index d40f286da7..e2873783ea 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -10,7 +10,6 @@ Please see LICENSE files in the repository root for full details.
 import React, { StrictMode } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import classNames from "classnames";
-import { type IDeferred, defer } from "matrix-js-sdk/src/utils";
 import { TypedEventEmitter } from "matrix-js-sdk/src/matrix";
 import { Glass, TooltipProvider } from "@vector-im/compound-web";
 
@@ -18,6 +17,7 @@ import defaultDispatcher from "./dispatcher/dispatcher";
 import AsyncWrapper from "./AsyncWrapper";
 import { type Defaultize } from "./@types/common";
 import { type ActionPayload } from "./dispatcher/payloads";
+import { filterBoolean } from "./utils/arrays.ts";
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
 const STATIC_DIALOG_CONTAINER_ID = "mx_Dialog_StaticContainer";
@@ -29,12 +29,25 @@ export type ComponentType =
       }>
     | React.ComponentType<any>;
 
-// Generic type which returns the props of the Modal component with the onFinished being optional.
+/**
+ * The parameter types of the `onFinished` callback property exposed by the component which forms the
+ * body of the dialog.
+ *
+ * @typeParam C - The type of the React component which forms the body of the dialog.
+ */
+type OnFinishedParams<C extends ComponentType> = Parameters<React.ComponentProps<C>["onFinished"]>;
+
+/**
+ * The properties exposed by the `props` argument to {@link Modal.createDialog}: the same as
+ * those exposed by the underlying component, with the exception of `onFinished`, which is provided by
+ * `createDialog`.
+ *
+ * @typeParam C - The type of the React component which forms the body of the dialog.
+ */
 export type ComponentProps<C extends ComponentType> = Defaultize<
     Omit<React.ComponentProps<C>, "onFinished">,
     C["defaultProps"]
-> &
-    Partial<Pick<React.ComponentProps<C>, "onFinished">>;
+>;
 
 export interface IModal<C extends ComponentType> {
     elem: React.ReactNode;
@@ -42,15 +55,44 @@ export interface IModal<C extends ComponentType> {
     beforeClosePromise?: Promise<boolean>;
     closeReason?: ModalCloseReason;
     onBeforeClose?(reason?: ModalCloseReason): Promise<boolean>;
-    onFinished: ComponentProps<C>["onFinished"];
-    close(...args: Parameters<ComponentProps<C>["onFinished"]>): void;
+
+    /**
+     * Run the {@link deferred} with the given arguments, and close this modal.
+     *
+     * This method is passed as the `onFinished` callback to the underlying component,
+     * as well as being returned by {@link Modal.createDialog} to the caller.
+     */
+    close(...args: OnFinishedParams<C> | []): void;
+
     hidden?: boolean;
-    deferred?: IDeferred<Parameters<ComponentProps<C>["onFinished"]>>;
+
+    /** A deferred to resolve when the dialog closes, with the results as provided by
+     * the call to {@link close} (normally from the `onFinished` callback).
+     */
+    deferred?: PromiseWithResolvers<OnFinishedParams<C> | []>;
 }
 
+/** The result of {@link Modal.createDialog}.
+ *
+ * @typeParam C - The type of the React component which forms the body of the dialog.
+ */
 export interface IHandle<C extends ComponentType> {
-    finished: Promise<Parameters<ComponentProps<C>["onFinished"]>>;
-    close(...args: Parameters<ComponentProps<C>["onFinished"]>): void;
+    /**
+     * A promise which will resolve when the dialog closes.
+     *
+     * If the dialog body component calls the `onFinished` property, or the caller calls {@link close},
+     * the promise resolves with an array holding the arguments to that call.
+     *
+     * If the dialog is closed by clicking in the background, the promise resolves with an empty array.
+     */
+    finished: Promise<OnFinishedParams<C> | []>;
+
+    /**
+     * A function which, if called, will close the dialog.
+     *
+     * @param args - Arguments to return to {@link finished}.
+     */
+    close(...args: OnFinishedParams<C>): void;
 }
 
 interface IOptions<C extends ComponentType> {
@@ -160,13 +202,15 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
      * situations like the user logging out of the app.
      */
     public forceCloseAllModals(): void {
-        for (const modal of this.modals) {
+        const modals = filterBoolean([...this.modals, this.staticModal, this.priorityModal]);
+        for (const modal of modals) {
             modal.deferred?.resolve([]);
-            if (modal.onFinished) modal.onFinished.apply(null);
             this.emitClosed();
         }
 
         this.modals = [];
+        this.staticModal = null;
+        this.priorityModal = null;
         this.reRender();
     }
 
@@ -184,7 +228,6 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
         onFinishedProm: IHandle<C>["finished"];
     } {
         const modal = {
-            onFinished: props?.onFinished,
             onBeforeClose: options?.onBeforeClose,
             className,
 
@@ -192,8 +235,7 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
             elem: null,
         } as IModal<C>;
 
-        // never call this from onFinished() otherwise it will loop
-        const [closeDialog, onFinishedProm] = this.getCloseFn<C>(modal, props);
+        const [closeDialog, onFinishedProm] = this.getCloseFn<C>(modal);
 
         // don't attempt to reuse the same AsyncWrapper for different dialogs,
         // otherwise we'll get confused.
@@ -210,13 +252,10 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
         return { modal, closeDialog, onFinishedProm };
     }
 
-    private getCloseFn<C extends ComponentType>(
-        modal: IModal<C>,
-        props?: ComponentProps<C>,
-    ): [IHandle<C>["close"], IHandle<C>["finished"]] {
-        modal.deferred = defer<Parameters<ComponentProps<C>["onFinished"]>>();
+    private getCloseFn<C extends ComponentType>(modal: IModal<C>): [IHandle<C>["close"], IHandle<C>["finished"]] {
+        modal.deferred = Promise.withResolvers<OnFinishedParams<C> | []>();
         return [
-            async (...args: Parameters<ComponentProps<C>["onFinished"]>): Promise<void> => {
+            async (...args: OnFinishedParams<C>): Promise<void> => {
                 if (modal.beforeClosePromise) {
                     await modal.beforeClosePromise;
                 } else if (modal.onBeforeClose) {
@@ -228,7 +267,6 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
                     }
                 }
                 modal.deferred?.resolve(args);
-                if (props?.onFinished) props.onFinished.apply(null, args);
                 const i = this.modals.indexOf(modal);
                 if (i >= 0) {
                     this.modals.splice(i, 1);
@@ -276,7 +314,8 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
      *                  using React.lazy to async load the component.
      *                  e.g. `lazy(() => import('./MyComponent'))`
      *
-     * @param props properties to pass to the displayed component. (We will also pass an 'onFinished' property.)
+     * @param props properties to pass to the displayed component. (We will also pass an `onFinished` property; when
+     *     called, that property will close the dialog and return the results to the caller via {@link IHandle.finished}.)
      *
      * @param className CSS class to apply to the modal wrapper
      *
@@ -291,7 +330,7 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
      *                                 static at a time.
      * @param options? extra options for the dialog
      * @param options.onBeforeClose a callback to decide whether to close the dialog
-     * @returns Object with 'close' parameter being a function that will close the dialog
+     * @returns {@link IHandle} object.
      */
     public createDialog<C extends ComponentType>(
         component: C,
diff --git a/src/NodeAnimator.tsx b/src/NodeAnimator.tsx
index d350de8dd8..2bcacdfbce 100644
--- a/src/NodeAnimator.tsx
+++ b/src/NodeAnimator.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 Key, type RefObject, type ReactElement, type RefCallback } from "react";
+import React, { type Key, type RefObject, type ReactElement, type RefCallback, type HTMLAttributes } from "react";
 
 interface IChildProps {
     style: React.CSSProperties;
@@ -57,7 +57,8 @@ export default class NodeAnimator extends React.Component<IProps> {
      * @param {React.CSSProperties} styles a key/value pair of CSS properties
      * @returns {void}
      */
-    private applyStyles(node: HTMLElement, styles: React.CSSProperties): void {
+    private applyStyles(node: HTMLElement, styles?: React.CSSProperties): void {
+        if (!styles) return;
         Object.entries(styles).forEach(([property, value]) => {
             node.style[property as keyof Omit<CSSStyleDeclaration, "length" | "parentRule">] = value;
         });
@@ -68,21 +69,22 @@ export default class NodeAnimator extends React.Component<IProps> {
         this.children = {};
         React.Children.toArray(newChildren).forEach((c) => {
             if (!isReactElement(c)) return;
+            const props = c.props as HTMLAttributes<HTMLElement>;
             if (oldChildren[c.key!]) {
                 const old = oldChildren[c.key!];
                 const oldNode = this.nodes[old.key!];
 
-                if (oldNode && oldNode.style.left !== c.props.style.left) {
-                    this.applyStyles(oldNode, { left: c.props.style.left });
+                if (oldNode && props.style && oldNode.style.left !== props.style.left) {
+                    this.applyStyles(oldNode, { left: props.style.left });
                 }
                 // clone the old element with the props (and children) of the new element
                 // so prop updates are still received by the children.
-                this.children[c.key!] = React.cloneElement(old, c.props, c.props.children);
+                this.children[c.key!] = React.cloneElement(old, props, props.children);
             } else {
                 // new element. If we have a startStyle, use that as the style and go through
                 // the enter animations
                 const newProps: Partial<IChildProps> = {};
-                const restingStyle = c.props.style;
+                const restingStyle = props.style;
 
                 const startStyles = this.props.startStyles;
                 if (startStyles.length > 0) {
@@ -97,7 +99,7 @@ export default class NodeAnimator extends React.Component<IProps> {
         });
     }
 
-    private collectNode(k: Key, domNode: HTMLElement | null, restingStyle: React.CSSProperties): void {
+    private collectNode(k: Key, domNode: HTMLElement | null, restingStyle?: React.CSSProperties): void {
         const key = typeof k === "bigint" ? Number(k) : k;
         if (domNode && this.nodes[key] === undefined && this.props.startStyles.length > 0) {
             const startStyles = this.props.startStyles;
diff --git a/src/Notifier.ts b/src/Notifier.ts
index b24e146fbc..7dce26d6bd 100644
--- a/src/Notifier.ts
+++ b/src/Notifier.ts
@@ -43,8 +43,6 @@ import { isPushNotifyDisabled } from "./settings/controllers/NotificationControl
 import UserActivity from "./UserActivity";
 import { mediaFromMxc } from "./customisations/Media";
 import ErrorDialog from "./components/views/dialogs/ErrorDialog";
-import LegacyCallHandler from "./LegacyCallHandler";
-import VoipUserMapper from "./VoipUserMapper";
 import { SdkContextClass } from "./contexts/SDKContext";
 import { localNotificationsAreSilenced, createLocalNotificationSettingsIfNeeded } from "./utils/notifications";
 import { getIncomingCallToastKey, IncomingCallToast } from "./toasts/IncomingCallToast";
@@ -447,14 +445,7 @@ class NotifierClass extends TypedEventEmitter<keyof EmittedEvents, EmittedEvents
 
     // XXX: exported for tests
     public evaluateEvent(ev: MatrixEvent): void {
-        let roomId = ev.getRoomId()!;
-        if (LegacyCallHandler.instance.getSupportsVirtualRooms()) {
-            // Attempt to translate a virtual room to a native one
-            const nativeRoomId = VoipUserMapper.sharedInstance().nativeRoomForVirtualRoom(roomId);
-            if (nativeRoomId) {
-                roomId = nativeRoomId;
-            }
-        }
+        const roomId = ev.getRoomId()!;
         const room = MatrixClientPeg.safeGet().getRoom(roomId);
         if (!room) {
             // e.g we are in the process of joining a room.
diff --git a/src/Registration.tsx b/src/Registration.tsx
index ea0264fab3..22eb6e15ff 100644
--- a/src/Registration.tsx
+++ b/src/Registration.tsx
@@ -62,14 +62,14 @@ export async function startAnyRegistrationFlow(
                   </button>,
               ]
             : [],
-        onFinished: (proceed) => {
-            if (proceed) {
-                dis.dispatch({ action: "start_login", screenAfterLogin: options.screen_after });
-            } else if (options.go_home_on_cancel) {
-                dis.dispatch({ action: Action.ViewHomePage });
-            } else if (options.go_welcome_on_cancel) {
-                dis.dispatch({ action: "view_welcome_page" });
-            }
-        },
+    });
+    modal.finished.then(([proceed]) => {
+        if (proceed) {
+            dis.dispatch({ action: "start_login", screenAfterLogin: options.screen_after });
+        } else if (options.go_home_on_cancel) {
+            dis.dispatch({ action: Action.ViewHomePage });
+        } else if (options.go_welcome_on_cancel) {
+            dis.dispatch({ action: "view_welcome_page" });
+        }
     });
 }
diff --git a/src/Rooms.ts b/src/Rooms.ts
index cf458fef84..b29fa1c659 100644
--- a/src/Rooms.ts
+++ b/src/Rooms.ts
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import { type Room, EventType, type RoomMember, type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import AliasCustomisations from "./customisations/Alias";
+import { filterValidMDirect } from "./utils/dm/filterValidMDirect.ts";
 
 /**
  * Given a room object, return the alias we should use for it,
@@ -56,39 +57,23 @@ export async function setDMRoom(client: MatrixClient, roomId: string, userId: st
     if (client.isGuest()) return;
 
     const mDirectEvent = client.getAccountData(EventType.Direct);
-    const currentContent = mDirectEvent?.getContent() || {};
+    const { filteredContent } = filterValidMDirect(mDirectEvent?.getContent() ?? {});
 
-    const dmRoomMap = new Map(Object.entries(currentContent));
-    let modified = false;
-
-    // remove it from the lists of any others users
-    // (it can only be a DM room for one person)
-    for (const thisUserId of dmRoomMap.keys()) {
-        const roomList = dmRoomMap.get(thisUserId) || [];
-
-        if (thisUserId != userId) {
-            const indexOfRoom = roomList.indexOf(roomId);
-            if (indexOfRoom > -1) {
-                roomList.splice(indexOfRoom, 1);
-                modified = true;
-            }
-        }
+    // remove it from the lists of all users (it can only be a DM room for one person)
+    for (const thisUserId in filteredContent) {
+        if (!filteredContent[thisUserId]) continue;
+        filteredContent[thisUserId] = filteredContent[thisUserId].filter((room) => room !== roomId);
     }
 
-    // now add it, if it's not already there
+    // now add it if the caller asked for it to be a DM room
     if (userId) {
-        const roomList = dmRoomMap.get(userId) || [];
-        if (roomList.indexOf(roomId) == -1) {
-            roomList.push(roomId);
-            modified = true;
+        if (!filteredContent[userId]) {
+            filteredContent[userId] = [];
         }
-        dmRoomMap.set(userId, roomList);
+        filteredContent[userId].push(roomId);
     }
 
-    // prevent unnecessary calls to setAccountData
-    if (!modified) return;
-
-    await client.setAccountData(EventType.Direct, Object.fromEntries(dmRoomMap));
+    await client.setAccountData(EventType.Direct, filteredContent);
 }
 
 /**
diff --git a/src/Searching.ts b/src/Searching.ts
index f9b2830e85..d507bd10ef 100644
--- a/src/Searching.ts
+++ b/src/Searching.ts
@@ -718,4 +718,8 @@ export interface SearchInfo {
      * The total count of matching results as returned by the backend.
      */
     count?: number;
+    /**
+     * Describe the error if any occured.
+     */
+    error?: Error;
 }
diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts
index b497c57a10..bfd0eb237d 100644
--- a/src/SecurityManager.ts
+++ b/src/SecurityManager.ts
@@ -19,7 +19,6 @@ 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 +49,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 +122,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) {
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index 865da9e51c..c8563509f2 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -52,7 +52,6 @@ import SlashCommandHelpDialog from "./components/views/dialogs/SlashCommandHelpD
 import { shouldShowComponent } from "./customisations/helpers/UIComponents";
 import { TimelineRenderingType } from "./contexts/RoomContext";
 import { type ViewRoomPayload } from "./dispatcher/payloads/ViewRoomPayload";
-import VoipUserMapper from "./VoipUserMapper";
 import { htmlSerializeFromMdIfNeeded } from "./editor/serialize";
 import { leaveRoomBehaviour } from "./utils/leave-behaviour";
 import { MatrixClientPeg } from "./MatrixClientPeg";
@@ -61,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 };
 
@@ -664,6 +664,24 @@ 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];
+                    return success(manuallyVerifyDevice(cli, deviceId, fingerprint));
+                }
+            }
+            return reject(this.getUsage());
+        },
+        category: CommandCategories.advanced,
+        renderingTypes: [TimelineRenderingType.Room],
+    }),
     new Command({
         command: "discardsession",
         description: _td("slash_command|discardsession"),
@@ -743,28 +761,6 @@ export const Commands = [
         },
         category: CommandCategories.advanced,
     }),
-    new Command({
-        command: "tovirtual",
-        description: _td("slash_command|tovirtual"),
-        category: CommandCategories.advanced,
-        isEnabled(cli): boolean {
-            return !!LegacyCallHandler.instance.getSupportsVirtualRooms() && !isCurrentLocalRoom(cli);
-        },
-        runFn: (cli, roomId) => {
-            return success(
-                (async (): Promise<void> => {
-                    const room = await VoipUserMapper.sharedInstance().getVirtualRoomForRoom(roomId);
-                    if (!room) throw new UserFriendlyError("slash_command|tovirtual_not_found");
-                    dis.dispatch<ViewRoomPayload>({
-                        action: Action.ViewRoom,
-                        room_id: room.roomId,
-                        metricsTrigger: "SlashCommand",
-                        metricsViaKeyboard: true,
-                    });
-                })(),
-            );
-        },
-    }),
     new Command({
         command: "query",
         description: _td("slash_command|query"),
diff --git a/src/SlidingSyncManager.ts b/src/SlidingSyncManager.ts
index 88b839312d..815e438da7 100644
--- a/src/SlidingSyncManager.ts
+++ b/src/SlidingSyncManager.ts
@@ -49,7 +49,7 @@ import {
     SlidingSyncState,
 } from "matrix-js-sdk/src/sliding-sync";
 import { logger } from "matrix-js-sdk/src/logger";
-import { defer, sleep } from "matrix-js-sdk/src/utils";
+import { sleep } from "matrix-js-sdk/src/utils";
 
 // how long to long poll for
 const SLIDING_SYNC_TIMEOUT_MS = 20 * 1000;
@@ -184,7 +184,7 @@ export class SlidingSyncManager {
     public slidingSync?: SlidingSync;
     private client?: MatrixClient;
 
-    private configureDefer = defer<void>();
+    private configureDefer = Promise.withResolvers<void>();
 
     public static get instance(): SlidingSyncManager {
         return SlidingSyncManager.internalInstance;
diff --git a/src/VoipUserMapper.ts b/src/VoipUserMapper.ts
deleted file mode 100644
index c2a7810d96..0000000000
--- a/src/VoipUserMapper.ts
+++ /dev/null
@@ -1,150 +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 { type Room, EventType } from "matrix-js-sdk/src/matrix";
-import { KnownMembership } from "matrix-js-sdk/src/types";
-import { logger } from "matrix-js-sdk/src/logger";
-
-import { ensureVirtualRoomExists } from "./createRoom";
-import { MatrixClientPeg } from "./MatrixClientPeg";
-import DMRoomMap from "./utils/DMRoomMap";
-import LegacyCallHandler from "./LegacyCallHandler";
-import { VIRTUAL_ROOM_EVENT_TYPE } from "./call-types";
-import { findDMForUser } from "./utils/dm/findDMForUser";
-
-// Functions for mapping virtual users & rooms. Currently the only lookup
-// is sip virtual: there could be others in the future.
-
-export default class VoipUserMapper {
-    // We store mappings of virtual -> native room IDs here until the local echo for the
-    // account data arrives.
-    private virtualToNativeRoomIdCache = new Map<string, string>();
-
-    public static sharedInstance(): VoipUserMapper {
-        if (window.mxVoipUserMapper === undefined) window.mxVoipUserMapper = new VoipUserMapper();
-        return window.mxVoipUserMapper;
-    }
-
-    private async userToVirtualUser(userId: string): Promise<string | null> {
-        const results = await LegacyCallHandler.instance.sipVirtualLookup(userId);
-        if (results.length === 0 || !results[0].fields.lookup_success) return null;
-        return results[0].userid;
-    }
-
-    private async getVirtualUserForRoom(roomId: string): Promise<string | null> {
-        const userId = DMRoomMap.shared().getUserIdForRoomId(roomId);
-        if (!userId) return null;
-
-        const virtualUser = await this.userToVirtualUser(userId);
-        if (!virtualUser) return null;
-
-        return virtualUser;
-    }
-
-    public async getOrCreateVirtualRoomForRoom(roomId: string): Promise<string | null> {
-        const virtualUser = await this.getVirtualUserForRoom(roomId);
-        if (!virtualUser) return null;
-
-        const cli = MatrixClientPeg.safeGet();
-        const virtualRoomId = await ensureVirtualRoomExists(cli, virtualUser, roomId);
-        cli.setRoomAccountData(virtualRoomId!, VIRTUAL_ROOM_EVENT_TYPE, {
-            native_room: roomId,
-        });
-
-        this.virtualToNativeRoomIdCache.set(virtualRoomId!, roomId);
-
-        return virtualRoomId;
-    }
-
-    /**
-     * Gets the ID of the virtual room for a room, or null if the room has no
-     * virtual room
-     */
-    public async getVirtualRoomForRoom(roomId: string): Promise<Room | undefined> {
-        const virtualUser = await this.getVirtualUserForRoom(roomId);
-        if (!virtualUser) return undefined;
-
-        return findDMForUser(MatrixClientPeg.safeGet(), virtualUser);
-    }
-
-    public nativeRoomForVirtualRoom(roomId: string): string | null {
-        const cachedNativeRoomId = this.virtualToNativeRoomIdCache.get(roomId);
-        if (cachedNativeRoomId) {
-            logger.log(
-                "Returning native room ID " + cachedNativeRoomId + " for virtual room ID " + roomId + " from cache",
-            );
-            return cachedNativeRoomId;
-        }
-
-        const cli = MatrixClientPeg.safeGet();
-        const virtualRoom = cli.getRoom(roomId);
-        if (!virtualRoom) return null;
-        const virtualRoomEvent = virtualRoom.getAccountData(VIRTUAL_ROOM_EVENT_TYPE);
-        if (!virtualRoomEvent || !virtualRoomEvent.getContent()) return null;
-        const nativeRoomID = virtualRoomEvent.getContent()["native_room"];
-        const nativeRoom = cli.getRoom(nativeRoomID);
-        if (!nativeRoom || nativeRoom.getMyMembership() !== KnownMembership.Join) return null;
-
-        return nativeRoomID;
-    }
-
-    public isVirtualRoom(room: Room): boolean {
-        if (this.nativeRoomForVirtualRoom(room.roomId)) return true;
-
-        if (this.virtualToNativeRoomIdCache.has(room.roomId)) return true;
-
-        // also look in the create event for the claimed native room ID, which is the only
-        // way we can recognise a virtual room we've created when it first arrives down
-        // our stream. We don't trust this in general though, as it could be faked by an
-        // inviter: our main source of truth is the DM state.
-        const roomCreateEvent = room.currentState.getStateEvents(EventType.RoomCreate, "");
-        if (!roomCreateEvent || !roomCreateEvent.getContent()) return false;
-        // we only look at this for rooms we created (so inviters can't just cause rooms
-        // to be invisible)
-        if (roomCreateEvent.getSender() !== MatrixClientPeg.safeGet().getUserId()) return false;
-        const claimedNativeRoomId = roomCreateEvent.getContent()[VIRTUAL_ROOM_EVENT_TYPE];
-        return Boolean(claimedNativeRoomId);
-    }
-
-    public async onNewInvitedRoom(invitedRoom: Room): Promise<void> {
-        if (!LegacyCallHandler.instance.getSupportsVirtualRooms()) return;
-
-        const inviterId = invitedRoom.getDMInviter();
-        if (!inviterId) {
-            logger.error("Could not find DM inviter for room id: " + invitedRoom.roomId);
-        }
-
-        logger.log(`Checking virtual-ness of room ID ${invitedRoom.roomId}, invited by ${inviterId}`);
-        const result = await LegacyCallHandler.instance.sipNativeLookup(inviterId!);
-        if (result.length === 0) {
-            return;
-        }
-
-        if (result[0].fields.is_virtual) {
-            const cli = MatrixClientPeg.safeGet();
-            const nativeUser = result[0].userid;
-            const nativeRoom = findDMForUser(cli, nativeUser);
-            if (nativeRoom) {
-                // It's a virtual room with a matching native room, so set the room account data. This
-                // will make sure we know where how to map calls and also allow us know not to display
-                // it in the future.
-                cli.setRoomAccountData(invitedRoom.roomId, VIRTUAL_ROOM_EVENT_TYPE, {
-                    native_room: nativeRoom.roomId,
-                });
-                // also auto-join the virtual room if we have a matching native room
-                // (possibly we should only join if we've also joined the native room, then we'd also have
-                // to make sure we joined virtual rooms on joining a native one)
-                cli.joinRoom(invitedRoom.roomId);
-
-                // also put this room in the virtual room ID cache so isVirtualRoom return the right answer
-                // in however long it takes for the echo of setAccountData to come down the sync
-                this.virtualToNativeRoomIdCache.set(invitedRoom.roomId, nativeRoom.roomId);
-            }
-        }
-    }
-}
diff --git a/src/WorkerManager.ts b/src/WorkerManager.ts
index a8a95ca727..1d403be88c 100644
--- a/src/WorkerManager.ts
+++ b/src/WorkerManager.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 { defer, type IDeferred } from "matrix-js-sdk/src/utils";
-
 import { type WorkerPayload } from "./workers/worker";
 
 export class WorkerManager<Request extends object, Response> {
     private readonly worker: Worker;
     private seq = 0;
-    private pendingDeferredMap = new Map<number, IDeferred<Response>>();
+    private pendingDeferredMap = new Map<number, PromiseWithResolvers<Response>>();
 
     public constructor(worker: Worker) {
         this.worker = worker;
@@ -30,7 +28,7 @@ export class WorkerManager<Request extends object, Response> {
 
     public call(request: Request): Promise<Response> {
         const seq = this.seq++;
-        const deferred = defer<Response>();
+        const deferred = Promise.withResolvers<Response>();
         this.pendingDeferredMap.set(seq, deferred);
         this.worker.postMessage({ seq, ...request });
         return deferred.promise;
diff --git a/src/accessibility/KeyboardShortcuts.ts b/src/accessibility/KeyboardShortcuts.ts
index da0097f4b2..ec5b8312b9 100644
--- a/src/accessibility/KeyboardShortcuts.ts
+++ b/src/accessibility/KeyboardShortcuts.ts
@@ -521,7 +521,8 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
     [KeyBindingAction.GoToHome]: {
         default: {
             ctrlKey: true,
-            altKey: true,
+            altKey: !IS_MAC,
+            shiftKey: IS_MAC,
             key: Key.H,
         },
         displayName: _td("keyboard|go_home_view"),
@@ -586,7 +587,7 @@ export const KEYBOARD_SHORTCUTS: IKeyboardShortcuts = {
         default: {
             ctrlKey: true,
             shiftKey: true,
-            key: Key.H,
+            key: Key.J,
         },
         displayName: _td("keyboard|toggle_hidden_events"),
     },
diff --git a/src/accessibility/RovingTabIndex.tsx b/src/accessibility/RovingTabIndex.tsx
index 7d4e291e5b..9942b4398c 100644
--- a/src/accessibility/RovingTabIndex.tsx
+++ b/src/accessibility/RovingTabIndex.tsx
@@ -212,7 +212,7 @@ export const RovingTabIndexProvider: React.FC<IProps> = ({
     scrollIntoView,
     onKeyDown,
 }) => {
-    const [state, dispatch] = useReducer<Reducer<IState, Action>>(reducer, {
+    const [state, dispatch] = useReducer<IState, [Action]>(reducer, {
         nodes: [],
     });
 
diff --git a/src/accessibility/Toolbar.tsx b/src/accessibility/Toolbar.tsx
index 317ff8b936..5583292e48 100644
--- a/src/accessibility/Toolbar.tsx
+++ b/src/accessibility/Toolbar.tsx
@@ -6,18 +6,20 @@ 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, { forwardRef } from "react";
+import React, { type Ref, type JSX } from "react";
 
 import { RovingTabIndexProvider } from "./RovingTabIndex";
 import { getKeyBindingsManager } from "../KeyBindingsManager";
 import { KeyBindingAction } from "./KeyboardShortcuts";
 
-interface IProps extends Omit<React.HTMLProps<HTMLDivElement>, "onKeyDown"> {}
+interface IProps extends Omit<React.HTMLProps<HTMLDivElement>, "onKeyDown"> {
+    ref?: Ref<HTMLDivElement>;
+}
 
 // This component implements the Toolbar design pattern from the WAI-ARIA Authoring Practices guidelines.
 // https://www.w3.org/TR/wai-aria-practices-1.1/#toolbar
 // All buttons passed in children must use RovingTabIndex to set `onFocus`, `isActive`, `ref`
-const Toolbar = forwardRef<HTMLDivElement, IProps>(({ children, ...props }, ref) => {
+const Toolbar = ({ children, ref, ...props }: IProps): JSX.Element => {
     const onKeyDown = (ev: React.KeyboardEvent): void => {
         const target = ev.target as HTMLElement;
         // Don't interfere with input default keydown behaviour
@@ -55,6 +57,6 @@ const Toolbar = forwardRef<HTMLDivElement, IProps>(({ children, ...props }, ref)
             )}
         </RovingTabIndexProvider>
     );
-});
+};
 
 export default Toolbar;
diff --git a/src/accessibility/context_menu/ContextMenuButton.tsx b/src/accessibility/context_menu/ContextMenuButton.tsx
index 8096203d0e..df16d15821 100644
--- a/src/accessibility/context_menu/ContextMenuButton.tsx
+++ b/src/accessibility/context_menu/ContextMenuButton.tsx
@@ -8,7 +8,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, { forwardRef, type Ref } from "react";
+import React, { type Ref, type JSX } from "react";
 
 import AccessibleButton, { type ButtonProps } from "../../components/views/elements/AccessibleButton";
 
@@ -16,13 +16,19 @@ type Props<T extends keyof HTMLElementTagNameMap> = ButtonProps<T> & {
     label?: string;
     // whether the context menu is currently open
     isExpanded: boolean;
+    ref?: Ref<HTMLElementTagNameMap[T]>;
 };
 
 // Semantic component for representing the AccessibleButton which launches a <ContextMenu />
-export const ContextMenuButton = forwardRef(function <T extends keyof HTMLElementTagNameMap>(
-    { label, isExpanded, children, onClick, onContextMenu, ...props }: Props<T>,
-    ref: Ref<HTMLElementTagNameMap[T]>,
-) {
+export const ContextMenuButton = function <T extends keyof HTMLElementTagNameMap>({
+    label,
+    isExpanded,
+    children,
+    onClick,
+    onContextMenu,
+    ref,
+    ...props
+}: Props<T>): JSX.Element {
     return (
         <AccessibleButton
             {...props}
@@ -36,4 +42,4 @@ export const ContextMenuButton = forwardRef(function <T extends keyof HTMLElemen
             {children}
         </AccessibleButton>
     );
-});
+};
diff --git a/src/accessibility/context_menu/ContextMenuTooltipButton.tsx b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
index f58fbea171..b0d0156c0f 100644
--- a/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
+++ b/src/accessibility/context_menu/ContextMenuTooltipButton.tsx
@@ -8,7 +8,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, { forwardRef, type Ref } from "react";
+import React, { type JSX } from "react";
 
 import AccessibleButton, { type ButtonProps } from "../../components/views/elements/AccessibleButton";
 
@@ -18,10 +18,14 @@ type Props<T extends keyof HTMLElementTagNameMap> = ButtonProps<T> & {
 };
 
 // Semantic component for representing the AccessibleButton which launches a <ContextMenu />
-export const ContextMenuTooltipButton = forwardRef(function <T extends keyof HTMLElementTagNameMap>(
-    { isExpanded, children, onClick, onContextMenu, ...props }: Props<T>,
-    ref: Ref<HTMLElementTagNameMap[T]>,
-) {
+export const ContextMenuTooltipButton = function <T extends keyof HTMLElementTagNameMap>({
+    isExpanded,
+    children,
+    onClick,
+    onContextMenu,
+    ref,
+    ...props
+}: Props<T>): JSX.Element {
     return (
         <AccessibleButton
             {...props}
@@ -35,4 +39,4 @@ export const ContextMenuTooltipButton = forwardRef(function <T extends keyof HTM
             {children}
         </AccessibleButton>
     );
-});
+};
diff --git a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
index 9b9683b798..a2fef4e1c9 100644
--- a/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
+++ b/src/async-components/views/dialogs/security/NewRecoveryMethodDialog.tsx
@@ -49,15 +49,8 @@ export default function NewRecoveryMethodDialog({ onFinished }: NewRecoveryMetho
         if (isKeyBackupEnabled) {
             onFinished();
         } else {
-            Modal.createDialog(
-                RestoreKeyBackupDialog,
-                {
-                    onFinished,
-                },
-                undefined,
-                false,
-                true,
-            );
+            const { finished } = Modal.createDialog(RestoreKeyBackupDialog, {}, undefined, false, true);
+            finished.then(onFinished);
         }
     }
 
diff --git a/src/audio/BackgroundAudio.ts b/src/audio/BackgroundAudio.ts
index c90016eef9..eda10c0904 100644
--- a/src/audio/BackgroundAudio.ts
+++ b/src/audio/BackgroundAudio.ts
@@ -48,6 +48,12 @@ export class BackgroundAudio {
         source.buffer = this.sounds[url];
         source.loop = loop;
         source.connect(this.audioContext.destination);
+
+        await this.audioContext.resume();
+        source.onended = () => {
+            this.audioContext.suspend();
+        };
+
         source.start();
         return source;
     }
diff --git a/src/audio/Playback.ts b/src/audio/Playback.ts
index 58b8a23c22..54d2c710d0 100644
--- a/src/audio/Playback.ts
+++ b/src/audio/Playback.ts
@@ -9,7 +9,6 @@ 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 { defer } from "matrix-js-sdk/src/utils";
 
 import { UPDATE_EVENT } from "../stores/AsyncStore";
 import { arrayFastResample } from "../utils/arrays";
@@ -158,42 +157,27 @@ export class Playback extends EventEmitter implements IDestroyable, PlaybackInte
             // 5mb
             logger.log("Audio file too large: processing through <audio /> element");
             this.element = document.createElement("AUDIO") as HTMLAudioElement;
-            const deferred = defer<unknown>();
+            const deferred = Promise.withResolvers<unknown>();
             this.element.onloadeddata = deferred.resolve;
             this.element.onerror = deferred.reject;
             this.element.src = URL.createObjectURL(new Blob([this.buf]));
             await deferred.promise; // make sure the audio element is ready for us
         } else {
-            // Safari compat: promise API not supported on this function
-            this.audioBuf = await new Promise((resolve, reject) => {
-                this.context.decodeAudioData(
-                    this.buf,
-                    (b) => resolve(b),
-                    async (e): Promise<void> => {
-                        try {
-                            // This error handler is largely for Safari as well, which doesn't support Opus/Ogg
-                            // very well.
-                            logger.error("Error decoding recording: ", e);
-                            logger.warn("Trying to re-encode to WAV instead...");
+            try {
+                this.audioBuf = await this.context.decodeAudioData(this.buf);
+            } catch (e) {
+                logger.error("Error decoding recording:", e);
+                logger.warn("Trying to re-encode to WAV instead...");
 
-                            const wav = await decodeOgg(this.buf);
-
-                            // noinspection ES6MissingAwait - not needed when using callbacks
-                            this.context.decodeAudioData(
-                                wav,
-                                (b) => resolve(b),
-                                (e) => {
-                                    logger.error("Still failed to decode recording: ", e);
-                                    reject(e);
-                                },
-                            );
-                        } catch (e) {
-                            logger.error("Caught decoding error:", e);
-                            reject(e);
-                        }
-                    },
-                );
-            });
+                try {
+                    // This error handler is largely for Safari, which doesn't support Opus/Ogg very well.
+                    const wav = await decodeOgg(this.buf);
+                    this.audioBuf = await this.context.decodeAudioData(wav);
+                } catch (e) {
+                    logger.error("Error decoding recording:", e);
+                    throw e;
+                }
+            }
 
             // Update the waveform to the real waveform once we have channel data to use. We don't
             // exactly trust the user-provided waveform to be accurate...
diff --git a/src/audio/compat.ts b/src/audio/compat.ts
index 7af6ef68b2..d967596450 100644
--- a/src/audio/compat.ts
+++ b/src/audio/compat.ts
@@ -16,12 +16,11 @@ import { SAMPLE_RATE } from "./VoiceRecording";
 
 export function createAudioContext(opts?: AudioContextOptions): AudioContext {
     if (window.AudioContext) {
-        return new AudioContext(opts);
-    } else if (window.webkitAudioContext) {
-        // While the linter is correct that "a constructor name should not start with
-        // a lowercase letter", it's also wrong to think that we have control over this.
-        // eslint-disable-next-line new-cap
-        return new window.webkitAudioContext(opts);
+        const ctx = new AudioContext(opts);
+        // Initialize in suspended state, as Firefox starts using
+        // CPU/battery right away, even if we don't play any sound yet.
+        void ctx.suspend();
+        return ctx;
     } else {
         throw new Error("Unsupported browser");
     }
diff --git a/src/autocomplete/Autocompleter.ts b/src/autocomplete/Autocompleter.ts
index b3ab0ade46..2653de1034 100644
--- a/src/autocomplete/Autocompleter.ts
+++ b/src/autocomplete/Autocompleter.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 ReactElement } from "react";
+import { type ReactElement, type RefAttributes, type HTMLAttributes } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 
 import CommandProvider from "./CommandProvider";
@@ -31,7 +31,7 @@ export interface ICompletion {
     type?: "at-room" | "command" | "community" | "room" | "user";
     completion: string;
     completionId?: string;
-    component: ReactElement;
+    component: ReactElement<RefAttributes<HTMLElement> & HTMLAttributes<HTMLElement>>;
     range: ISelectionRange;
     command?: string;
     suffix?: string;
diff --git a/src/autocomplete/Components.tsx b/src/autocomplete/Components.tsx
index ebbc1732e2..f1493d0c23 100644
--- a/src/autocomplete/Components.tsx
+++ b/src/autocomplete/Components.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, { forwardRef } from "react";
+import React, { type Ref, type JSX } from "react";
 import classNames from "classnames";
 
 /* These were earlier stateless functional components but had to be converted
@@ -16,14 +16,24 @@ presumably wrap them in a <div> before rendering but I think this is the better
  */
 
 interface ITextualCompletionProps {
-    title?: string;
-    subtitle?: string;
-    description?: string;
-    className?: string;
+    "title"?: string;
+    "subtitle"?: string;
+    "description"?: string;
+    "className"?: string;
+    "aria-selected"?: boolean;
+    "ref"?: Ref<HTMLDivElement>;
 }
 
-export const TextualCompletion = forwardRef<ITextualCompletionProps, any>((props, ref) => {
-    const { title, subtitle, description, className, "aria-selected": ariaSelectedAttribute, ...restProps } = props;
+export const TextualCompletion = (props: ITextualCompletionProps): JSX.Element => {
+    const {
+        title,
+        subtitle,
+        description,
+        className,
+        "aria-selected": ariaSelectedAttribute,
+        ref,
+        ...restProps
+    } = props;
     return (
         <div
             {...restProps}
@@ -37,13 +47,13 @@ export const TextualCompletion = forwardRef<ITextualCompletionProps, any>((props
             <span className="mx_Autocomplete_Completion_description">{description}</span>
         </div>
     );
-});
+};
 
 interface IPillCompletionProps extends ITextualCompletionProps {
     children?: React.ReactNode;
 }
 
-export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref) => {
+export const PillCompletion = (props: IPillCompletionProps): JSX.Element => {
     const {
         title,
         subtitle,
@@ -51,6 +61,7 @@ export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref)
         className,
         children,
         "aria-selected": ariaSelectedAttribute,
+        ref,
         ...restProps
     } = props;
     return (
@@ -67,4 +78,4 @@ export const PillCompletion = forwardRef<IPillCompletionProps, any>((props, ref)
             <span className="mx_Autocomplete_Completion_description">{description}</span>
         </div>
     );
-});
+};
diff --git a/src/autocomplete/UserProvider.tsx b/src/autocomplete/UserProvider.tsx
index 9cd5564795..39accdc8da 100644
--- a/src/autocomplete/UserProvider.tsx
+++ b/src/autocomplete/UserProvider.tsx
@@ -127,7 +127,7 @@ export default class UserProvider extends AutocompleteProvider {
                     suffix: selection.beginning && range!.start === 0 ? ": " : " ",
                     href: makeUserPermalink(user.userId),
                     component: (
-                        <PillCompletion title={displayName} description={description}>
+                        <PillCompletion title={displayName} description={description ?? undefined}>
                             <MemberAvatar member={user} size="24px" />
                         </PillCompletion>
                     ),
diff --git a/src/call-types.ts b/src/call-types.ts
index 2a263174ef..6586bcf3b9 100644
--- a/src/call-types.ts
+++ b/src/call-types.ts
@@ -6,10 +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.
 */
 
-// Event type for room account data and room creation content used to mark rooms as virtual rooms
-// (and store the ID of their native room)
-export const VIRTUAL_ROOM_EVENT_TYPE = "im.vector.is_virtual_room";
-
 export const JitsiCallMemberEventType = "io.element.video.member";
 
 export interface JitsiCallMemberContent {
diff --git a/src/components/structures/IndicatorScrollbar.tsx b/src/components/structures/IndicatorScrollbar.tsx
index 1667d73336..f566e2d256 100644
--- a/src/components/structures/IndicatorScrollbar.tsx
+++ b/src/components/structures/IndicatorScrollbar.tsx
@@ -21,8 +21,6 @@ export type IProps<T extends keyof JSX.IntrinsicElements> = Omit<AutoHideScrollb
     // scroll horizontally rather than vertically. This should only be used on components
     // with no vertical scroll opportunity.
     verticalScrollsHorizontally?: boolean;
-
-    children: React.ReactNode;
 };
 
 interface IState {
diff --git a/src/components/structures/LeftPanel.tsx b/src/components/structures/LeftPanel.tsx
index 3686d52bca..3bd2518c8a 100644
--- a/src/components/structures/LeftPanel.tsx
+++ b/src/components/structures/LeftPanel.tsx
@@ -379,13 +379,14 @@ export default class LeftPanel extends React.Component<IProps, IState> {
     }
 
     public render(): React.ReactNode {
+        const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
         const containerClasses = classNames({
             mx_LeftPanel: true,
+            mx_LeftPanel_newRoomList: useNewRoomList,
             mx_LeftPanel_minimized: this.props.isMinimized,
         });
 
         const roomListClasses = classNames("mx_LeftPanel_actualRoomListContainer", "mx_AutoHideScrollbar");
-        const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
         if (useNewRoomList) {
             return (
                 <div className={containerClasses}>
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index cf68f85b4c..26e127f21f 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -259,9 +259,11 @@ class LoggedInView extends React.Component<IProps, IState> {
     private createResizer(): Resizer<ICollapseConfig, CollapseItem> {
         let panelSize: number | null;
         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 collapseConfig: ICollapseConfig = {
-            // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
-            toggleSize: 206 - 50,
+            toggleSize,
             onCollapsed: (collapsed) => {
                 panelCollapsed = collapsed;
                 if (collapsed) {
@@ -697,10 +699,18 @@ class LoggedInView extends React.Component<IProps, IState> {
             "mx_MatrixChat--with-avatar": this.state.backgroundImage,
         });
 
+        const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
+
+        const leftPanelWrapperClasses = classNames({
+            mx_LeftPanel_wrapper: true,
+            mx_LeftPanel_newRoomList: useNewRoomList,
+        });
+
         const audioFeedArraysForCalls = this.state.activeCalls.map((call) => {
             return <AudioFeedArrayForLegacyCall call={call} key={call.callId} />;
         });
 
+        const shouldUseMinimizedUI = !useNewRoomList && this.props.collapseLhs;
         return (
             <MatrixClientContextProvider client={this._matrixClient}>
                 <div
@@ -712,19 +722,21 @@ class LoggedInView extends React.Component<IProps, IState> {
                     <ToastContainer />
                     <div className={bodyClasses}>
                         <div className="mx_LeftPanel_outerWrapper">
-                            <LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
-                            <div className="mx_LeftPanel_wrapper">
-                                <BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
+                            <LeftPanelLiveShareWarning isMinimized={shouldUseMinimizedUI || false} />
+                            <div className={leftPanelWrapperClasses}>
+                                {!useNewRoomList && (
+                                    <BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
+                                )}
                                 <SpacePanel />
-                                <BackdropPanel backgroundImage={this.state.backgroundImage} />
+                                {!useNewRoomList && <BackdropPanel backgroundImage={this.state.backgroundImage} />}
                                 <div
                                     className="mx_LeftPanel_wrapper--user"
                                     ref={this._resizeContainer}
-                                    data-collapsed={this.props.collapseLhs ? true : undefined}
+                                    data-collapsed={shouldUseMinimizedUI ? true : undefined}
                                 >
                                     <LeftPanel
                                         pageType={this.props.page_type as PageTypes}
-                                        isMinimized={this.props.collapseLhs || false}
+                                        isMinimized={shouldUseMinimizedUI || false}
                                         resizeNotifier={this.props.resizeNotifier}
                                     />
                                 </div>
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 0f722ae53d..e61713ca69 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -13,20 +13,21 @@ import {
     EventType,
     HttpApiEvent,
     type MatrixClient,
-    type MatrixEvent,
+    MatrixEvent,
+    MsgType,
     type RoomType,
     SyncState,
     type SyncStateData,
     type TimelineEvents,
 } from "matrix-js-sdk/src/matrix";
-import { defer, type IDeferred, type QueryDict } from "matrix-js-sdk/src/utils";
+import { type QueryDict } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 import { throttle } from "lodash";
 import { CryptoEvent, type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
 import { TooltipProvider } from "@vector-im/compound-web";
-
 // what-input helps improve keyboard accessibility
 import "what-input";
+import sanitizeHtml from "sanitize-html";
 
 import PosthogTrackers from "../../PosthogTrackers";
 import { DecryptionFailureTracker } from "../../DecryptionFailureTracker";
@@ -50,6 +51,7 @@ 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 ThemeWatcher, { ThemeWatcherEvent } from "../../settings/watchers/ThemeWatcher";
 import { FontWatcher } from "../../settings/watchers/FontWatcher";
 import { storeRoomAliasInCache } from "../../RoomAliasCache";
@@ -94,7 +96,6 @@ import VerificationRequestToast from "../views/toasts/VerificationRequestToast";
 import PerformanceMonitor, { PerformanceEntryNames } from "../../performance";
 import UIStore, { UI_EVENTS } from "../../stores/UIStore";
 import SoftLogout from "./auth/SoftLogout";
-import { makeRoomPermalink } from "../../utils/permalinks/Permalinks";
 import { copyPlaintext } from "../../utils/strings";
 import { PosthogAnalytics } from "../../PosthogAnalytics";
 import { initSentry } from "../../sentry";
@@ -107,6 +108,7 @@ import Views from "../../Views";
 import { type FocusNextType, type ViewRoomPayload } from "../../dispatcher/payloads/ViewRoomPayload";
 import { type ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePagePayload";
 import { type AfterLeaveRoomPayload } from "../../dispatcher/payloads/AfterLeaveRoomPayload";
+import { type AfterForgetRoomPayload } from "../../dispatcher/payloads/AfterForgetRoomPayload";
 import { type DoAfterSyncPreparedPayload } from "../../dispatcher/payloads/DoAfterSyncPreparedPayload";
 import { type ViewStartChatOrReusePayload } from "../../dispatcher/payloads/ViewStartChatOrReusePayload";
 import { leaveRoomBehaviour } from "../../utils/leave-behaviour";
@@ -123,7 +125,7 @@ import { viewUserDeviceSettings } from "../../actions/handlers/viewUserDeviceSet
 import GenericToast from "../views/toasts/GenericToast";
 import RovingSpotlightDialog from "../views/dialogs/spotlight/SpotlightDialog";
 import { findDMForUser } from "../../utils/dm/findDMForUser";
-import { Linkify } from "../../HtmlUtils";
+import { getHtmlText, Linkify } from "../../HtmlUtils";
 import { NotificationLevel } from "../../stores/notifications/NotificationLevel";
 import { type UserTab } from "../views/dialogs/UserTab";
 import { shouldSkipSetupEncryption } from "../../utils/crypto/shouldSkipSetupEncryption";
@@ -135,6 +137,10 @@ import { LoginSplashView } from "./auth/LoginSplashView";
 import { cleanUpDraftsIfRequired } from "../../DraftCleaner";
 import { InitialCryptoSetupStore } from "../../stores/InitialCryptoSetupStore";
 import { setTheme } from "../../theme";
+import { type OpenForwardDialogPayload } from "../../dispatcher/payloads/OpenForwardDialogPayload";
+import { ShareFormat, type SharePayload } from "../../dispatcher/payloads/SharePayload";
+import Markdown from "../../Markdown";
+import { sanitizeHtmlParams } from "../../Linkify";
 
 // legacy export
 export { default as Views } from "../../Views";
@@ -165,12 +171,6 @@ interface IProps {
     initialScreenAfterLogin?: IScreen;
     // displayname, if any, to set on the device when logging in/registering.
     defaultDeviceDisplayName?: string;
-
-    // Used by tests, this function is called when session initialisation starts
-    // with a promise that resolves or rejects once the initialiation process
-    // has finished, so that tests can wait for this to avoid them executing over
-    // each other.
-    initPromiseCallback?: (p: Promise<void>) => void;
 }
 
 interface IState {
@@ -221,7 +221,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     };
 
     private firstSyncComplete = false;
-    private firstSyncPromise: IDeferred<void>;
+    private firstSyncPromise: PromiseWithResolvers<void>;
 
     private screenAfterLogin?: IScreen;
     private tokenLogin?: boolean;
@@ -260,7 +260,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
 
         // Used by _viewRoom before getting state from sync
         this.firstSyncComplete = false;
-        this.firstSyncPromise = defer();
+        this.firstSyncPromise = Promise.withResolvers();
 
         if (this.props.config.sync_timeline_limit) {
             MatrixClientPeg.opts.initialSyncLimit = this.props.config.sync_timeline_limit;
@@ -291,9 +291,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      */
     private startInitSession = (): void => {
         const initProm = this.initSession();
-        if (this.props.initPromiseCallback) {
-            this.props.initPromiseCallback(initProm);
-        }
 
         initProm.catch((err) => {
             // TODO: show an error screen, rather than a spinner of doom
@@ -711,36 +708,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case "copy_room":
                 this.copyRoom(payload.room_id);
                 break;
-            case "reject_invite":
-                Modal.createDialog(QuestionDialog, {
-                    title: _t("reject_invitation_dialog|title"),
-                    description: _t("reject_invitation_dialog|confirmation"),
-                    onFinished: (confirm) => {
-                        if (confirm) {
-                            // FIXME: controller shouldn't be loading a view :(
-                            const modal = Modal.createDialog(Spinner, undefined, "mx_Dialog_spinner");
-
-                            MatrixClientPeg.safeGet()
-                                .leave(payload.room_id)
-                                .then(
-                                    () => {
-                                        modal.close();
-                                        if (this.state.currentRoomId === payload.room_id) {
-                                            dis.dispatch({ action: Action.ViewHomePage });
-                                        }
-                                    },
-                                    (err) => {
-                                        modal.close();
-                                        Modal.createDialog(ErrorDialog, {
-                                            title: _t("reject_invitation_dialog|failed"),
-                                            description: err.toString(),
-                                        });
-                                    },
-                                );
-                        }
-                    },
-                });
-                break;
             case "view_user_info":
                 this.viewUser(payload.userId, payload.subAction);
                 break;
@@ -818,6 +785,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             case Action.ViewHomePage:
                 this.viewHome(payload.justRegistered);
                 break;
+            case Action.Share:
+                this.viewShare(payload.format, payload.msg);
+                break;
             case Action.ViewStartChatOrReuse:
                 this.chatCreateOrReuse(payload.user_id);
                 break;
@@ -1032,10 +1002,6 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         // Wait for the first sync to complete so that if a room does have an alias,
         // it would have been retrieved.
         if (!this.firstSyncComplete) {
-            if (!this.firstSyncPromise) {
-                logger.warn("Cannot view a room before first sync. room_id:", roomInfo.room_id);
-                return;
-            }
             await this.firstSyncPromise.promise;
         }
 
@@ -1146,8 +1112,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private viewUser(userId: string, subAction: string): void {
         // Wait for the first sync so that `getRoom` gives us a room object if it's
         // in the sync response
-        const waitForSync = this.firstSyncPromise ? this.firstSyncPromise.promise : Promise.resolve();
-        waitForSync.then(() => {
+        this.firstSyncPromise.promise.then(() => {
             if (subAction === "chat") {
                 this.chatCreateOrReuse(userId);
                 return;
@@ -1158,6 +1123,58 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         });
     }
 
+    private viewShare(format: ShareFormat, msg: string): void {
+        // Wait for the first sync so we can present possible rooms to share into
+        this.firstSyncPromise.promise.then(() => {
+            this.notifyNewScreen("share");
+            let rawEvent;
+            switch (format) {
+                case ShareFormat.Html: {
+                    rawEvent = {
+                        type: "m.room.message",
+                        content: {
+                            msgtype: MsgType.Text,
+                            body: getHtmlText(msg),
+                            format: "org.matrix.custom.html",
+                            formatted_body: sanitizeHtml(msg, sanitizeHtmlParams),
+                        },
+                        origin_server_ts: Date.now(),
+                    };
+                    break;
+                }
+                case ShareFormat.Markdown: {
+                    const html = new Markdown(msg).toHTML({ externalLinks: true });
+                    rawEvent = {
+                        type: "m.room.message",
+                        content: {
+                            msgtype: MsgType.Text,
+                            body: msg,
+                            format: "org.matrix.custom.html",
+                            formatted_body: html,
+                        },
+                        origin_server_ts: Date.now(),
+                    };
+                    break;
+                }
+                default:
+                    rawEvent = {
+                        type: "m.room.message",
+                        content: {
+                            msgtype: MsgType.Text,
+                            body: msg,
+                        },
+                        origin_server_ts: Date.now(),
+                    };
+            }
+            const event = new MatrixEvent(rawEvent);
+            dis.dispatch<OpenForwardDialogPayload>({
+                action: Action.OpenForwardDialog,
+                event: event,
+                permalinkCreator: null,
+            });
+        });
+    }
+
     private async createRoom(defaultPublic = false, defaultName?: string, type?: RoomType): Promise<void> {
         const modal = Modal.createDialog(CreateRoomDialog, {
             type,
@@ -1273,7 +1290,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
         const warnings = this.leaveRoomWarnings(roomId);
 
         const isSpace = roomToLeave?.isSpaceRoom();
-        Modal.createDialog(QuestionDialog, {
+        const { finished } = Modal.createDialog(QuestionDialog, {
             title: isSpace ? _t("space|leave_dialog_action") : _t("action|leave_room"),
             description: (
                 <span>
@@ -1289,16 +1306,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             ),
             button: _t("action|leave"),
             danger: warnings.length > 0,
-            onFinished: async (shouldLeave) => {
-                if (shouldLeave) {
-                    await leaveRoomBehaviour(cli, roomId);
+        });
 
-                    dis.dispatch<AfterLeaveRoomPayload>({
-                        action: Action.AfterLeaveRoom,
-                        room_id: roomId,
-                    });
-                }
-            },
+        finished.then(async ([shouldLeave]) => {
+            if (shouldLeave) {
+                await leaveRoomBehaviour(cli, roomId);
+
+                dis.dispatch<AfterLeaveRoomPayload>({
+                    action: Action.AfterLeaveRoom,
+                    room_id: roomId,
+                });
+            }
         });
     }
 
@@ -1312,10 +1330,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     dis.dispatch({ action: Action.ViewHomePage });
                 }
 
-                // We have to manually update the room list because the forgotten room will not
-                // be notified to us, therefore the room list will have no other way of knowing
-                // the room is forgotten.
-                if (room) RoomListStore.instance.manualRoomUpdate(room, RoomUpdateCause.RoomRemoved);
+                if (room) {
+                    // Legacy room list store needs to be told to manually remove this room
+                    RoomListStore.instance.manualRoomUpdate(room, RoomUpdateCause.RoomRemoved);
+                    // New room list store will remove the room on the following dispatch
+                    dis.dispatch<AfterForgetRoomPayload>({ action: Action.AfterForgetRoom, room });
+                }
             })
             .catch((err) => {
                 const errCode = err.errcode || _td("error|unknown_error_code");
@@ -1510,11 +1530,17 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
      * (useful for setting listeners)
      */
     private onWillStartClient(): void {
-        // reset the 'have completed first sync' flag,
-        // since we're about to start the client and therefore about
-        // to do the first sync
+        // Reset the 'have completed first sync' flag,
+        // since we're about to start the client and therefore about to do the first sync
+        // We resolve the existing promise with the new one to update any existing listeners
+        if (!this.firstSyncComplete) {
+            const firstSyncPromise = Promise.withResolvers<void>();
+            this.firstSyncPromise.resolve(firstSyncPromise.promise);
+            this.firstSyncPromise = firstSyncPromise;
+        } else {
+            this.firstSyncPromise = Promise.withResolvers();
+        }
         this.firstSyncComplete = false;
-        this.firstSyncPromise = defer();
         const cli = MatrixClientPeg.safeGet();
 
         // Allow the JS SDK to reap timeline events. This reduces the amount of
@@ -1596,7 +1622,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             });
         });
         cli.on(HttpApiEvent.NoConsent, function (message, consentUri) {
-            Modal.createDialog(
+            const { finished } = Modal.createDialog(
                 QuestionDialog,
                 {
                     title: _t("terms|tac_title"),
@@ -1607,16 +1633,16 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
                     ),
                     button: _t("terms|tac_button"),
                     cancelButton: _t("action|dismiss"),
-                    onFinished: (confirmed) => {
-                        if (confirmed) {
-                            const wnd = window.open(consentUri, "_blank")!;
-                            wnd.opener = null;
-                        }
-                    },
                 },
                 undefined,
                 true,
             );
+            finished.then(([confirmed]) => {
+                if (confirmed) {
+                    const wnd = window.open(consentUri, "_blank")!;
+                    wnd.opener = null;
+                }
+            });
         });
 
         DecryptionFailureTracker.instance
@@ -1776,6 +1802,20 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
             dis.dispatch({
                 action: Action.CreateChat,
             });
+        } else if (screen === "share") {
+            if (params && params["msg"] !== undefined) {
+                dis.dispatch<SharePayload>({
+                    action: Action.Share,
+                    msg: params["msg"],
+                    format: params["format"],
+                });
+            }
+            // 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) {
+                this.viewHome();
+            }
         } else if (screen === "settings") {
             dis.fire(Action.ViewUserSettings);
         } else if (screen === "welcome") {
diff --git a/src/components/structures/MatrixClientContextProvider.tsx b/src/components/structures/MatrixClientContextProvider.tsx
index e22d6bfcde..7d555f5809 100644
--- a/src/components/structures/MatrixClientContextProvider.tsx
+++ b/src/components/structures/MatrixClientContextProvider.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 PropsWithChildren, useEffect, useState } from "react";
+import React, { type PropsWithChildren, useEffect, useState, type JSX } from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 import { logger } from "matrix-js-sdk/src/logger";
@@ -85,7 +85,7 @@ interface Props {
  * A React component which exposes a {@link MatrixClientContext} and a {@link LocalDeviceVerificationStateContext}
  * to its children.
  */
-export function MatrixClientContextProvider(props: PropsWithChildren<Props>): React.JSX.Element {
+export function MatrixClientContextProvider(props: PropsWithChildren<Props>): JSX.Element {
     const verificationState = useLocalVerificationState(props.client);
     return (
         <MatrixClientContext.Provider value={props.client}>
diff --git a/src/components/structures/RightPanel.tsx b/src/components/structures/RightPanel.tsx
index 21e2a2ee71..94a5d34d60 100644
--- a/src/components/structures/RightPanel.tsx
+++ b/src/components/structures/RightPanel.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 ChangeEvent } from "react";
+import React from "react";
 import { type Room, type RoomState, RoomStateEvent, RoomMember, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { throttle } from "lodash";
 
@@ -15,7 +15,7 @@ import dis from "../../dispatcher/dispatcher";
 import { RightPanelPhases } from "../../stores/right-panel/RightPanelStorePhases";
 import RightPanelStore from "../../stores/right-panel/RightPanelStore";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
-import RoomSummaryCard from "../views/right_panel/RoomSummaryCard";
+import RoomSummaryCardView from "../views/right_panel/RoomSummaryCardView";
 import WidgetCard from "../views/right_panel/WidgetCard";
 import UserInfo from "../views/right_panel/UserInfo";
 import ThirdPartyMemberInfo from "../views/rooms/ThirdPartyMemberInfo";
@@ -49,8 +49,9 @@ interface RoomlessProps extends BaseProps {
 interface RoomProps extends BaseProps {
     room: Room;
     permalinkCreator: RoomPermalinkCreator;
-    onSearchChange?: (e: ChangeEvent) => void;
+    onSearchChange?: (term: string) => void;
     onSearchCancel?: () => void;
+    searchTerm?: string;
 }
 
 type Props = XOR<RoomlessProps, RoomProps>;
@@ -254,12 +255,13 @@ export default class RightPanel extends React.Component<Props, IState> {
             case RightPanelPhases.RoomSummary:
                 if (!!this.props.room) {
                     card = (
-                        <RoomSummaryCard
+                        <RoomSummaryCardView
                             room={this.props.room}
                             // whenever RightPanel is passed a room it is passed a permalinkcreator
                             permalinkCreator={this.props.permalinkCreator!}
                             onSearchChange={this.props.onSearchChange}
                             onSearchCancel={this.props.onSearchCancel}
+                            searchTerm={this.props.searchTerm}
                             focusRoomSearch={cardState?.focusRoomSearch}
                         />
                     );
@@ -280,7 +282,7 @@ export default class RightPanel extends React.Component<Props, IState> {
         }
 
         return (
-            <aside className="mx_RightPanel" id="mx_RightPanel">
+            <aside className="mx_RightPanel" id="mx_RightPanel" data-testid="right-panel">
                 {card}
             </aside>
         );
diff --git a/src/components/structures/RoomSearchView.tsx b/src/components/structures/RoomSearchView.tsx
index cd03a0140a..c4d4f30b05 100644
--- a/src/components/structures/RoomSearchView.tsx
+++ b/src/components/structures/RoomSearchView.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, forwardRef, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
+import React, { type JSX, type Ref, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import {
     type ISearchResults,
     type IThreadBundledRelationship,
@@ -21,8 +21,6 @@ import { _t } from "../../languageHandler";
 import { haveRendererForEvent } from "../../events/EventTileFactory";
 import SearchResultTile from "../views/rooms/SearchResultTile";
 import { searchPagination, SearchScope } from "../../Searching";
-import Modal from "../../Modal";
-import ErrorDialog from "../views/dialogs/ErrorDialog";
 import type ResizeNotifier from "../../utils/ResizeNotifier";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
@@ -45,274 +43,276 @@ interface Props {
     abortController?: AbortController;
     resizeNotifier: ResizeNotifier;
     className: string;
-    onUpdate(inProgress: boolean, results: ISearchResults | null): void;
+    onUpdate(inProgress: boolean, results: ISearchResults | null, error: Error | null): void;
+    ref?: Ref<ScrollPanel>;
 }
 
 // XXX: todo: merge overlapping results somehow?
 // XXX: why doesn't searching on name work?
-export const RoomSearchView = forwardRef<ScrollPanel, Props>(
-    ({ term, scope, promise, abortController, resizeNotifier, className, onUpdate, inProgress }: Props, ref) => {
-        const client = useContext(MatrixClientContext);
-        const roomContext = useScopedRoomContext("showHiddenEvents");
-        const [highlights, setHighlights] = useState<string[] | null>(null);
-        const [results, setResults] = useState<ISearchResults | null>(null);
-        const aborted = useRef(false);
-        // A map from room ID to permalink creator
-        const permalinkCreators = useMemo(() => new Map<string, RoomPermalinkCreator>(), []);
-        const innerRef = useRef<ScrollPanel>(null);
+export const RoomSearchView = ({
+    term,
+    scope,
+    promise,
+    abortController,
+    resizeNotifier,
+    className,
+    onUpdate,
+    inProgress,
+    ref,
+}: Props): JSX.Element => {
+    const client = useContext(MatrixClientContext);
+    const roomContext = useScopedRoomContext("showHiddenEvents");
+    const [highlights, setHighlights] = useState<string[] | null>(null);
+    const [results, setResults] = useState<ISearchResults | null>(null);
+    const aborted = useRef(false);
+    // A map from room ID to permalink creator
+    const permalinkCreators = useMemo(() => new Map<string, RoomPermalinkCreator>(), []);
+    const innerRef = useRef<ScrollPanel>(null);
 
-        useEffect(() => {
-            return () => {
-                permalinkCreators.forEach((pc) => pc.stop());
-                permalinkCreators.clear();
-            };
-        }, [permalinkCreators]);
+    useEffect(() => {
+        return () => {
+            permalinkCreators.forEach((pc) => pc.stop());
+            permalinkCreators.clear();
+        };
+    }, [permalinkCreators]);
 
-        const handleSearchResult = useCallback(
-            (searchPromise: Promise<ISearchResults>): Promise<boolean> => {
-                onUpdate(true, null);
+    const handleSearchResult = useCallback(
+        (searchPromise: Promise<ISearchResults>): Promise<boolean> => {
+            onUpdate(true, null, null);
 
-                return searchPromise.then(
-                    async (results): Promise<boolean> => {
-                        debuglog("search complete");
-                        if (aborted.current) {
-                            logger.error("Discarding stale search results");
-                            return false;
-                        }
+            return searchPromise.then(
+                async (results): Promise<boolean> => {
+                    debuglog("search complete");
+                    if (aborted.current) {
+                        logger.error("Discarding stale search results");
+                        return false;
+                    }
 
-                        // postgres on synapse returns us precise details of the strings
-                        // which actually got matched for highlighting.
-                        //
-                        // In either case, we want to highlight the literal search term
-                        // whether it was used by the search engine or not.
+                    // postgres on synapse returns us precise details of the strings
+                    // which actually got matched for highlighting.
+                    //
+                    // In either case, we want to highlight the literal search term
+                    // whether it was used by the search engine or not.
 
-                        let highlights = results.highlights;
-                        if (!highlights.includes(term)) {
-                            highlights = highlights.concat(term);
-                        }
+                    let highlights = results.highlights;
+                    if (!highlights.includes(term)) {
+                        highlights = highlights.concat(term);
+                    }
 
-                        // For overlapping highlights,
-                        // favour longer (more specific) terms first
-                        highlights = highlights.sort(function (a, b) {
-                            return b.length - a.length;
-                        });
+                    // For overlapping highlights,
+                    // favour longer (more specific) terms first
+                    highlights = highlights.sort(function (a, b) {
+                        return b.length - a.length;
+                    });
 
-                        for (const result of results.results) {
-                            for (const event of result.context.getTimeline()) {
-                                const bundledRelationship =
-                                    event.getServerAggregatedRelation<IThreadBundledRelationship>(
-                                        THREAD_RELATION_TYPE.name,
-                                    );
-                                if (!bundledRelationship || event.getThread()) continue;
-                                const room = client.getRoom(event.getRoomId());
-                                const thread = room?.findThreadForEvent(event);
-                                if (thread) {
-                                    event.setThread(thread);
-                                } else {
-                                    room?.createThread(event.getId()!, event, [], true);
-                                }
+                    for (const result of results.results) {
+                        for (const event of result.context.getTimeline()) {
+                            const bundledRelationship = event.getServerAggregatedRelation<IThreadBundledRelationship>(
+                                THREAD_RELATION_TYPE.name,
+                            );
+                            if (!bundledRelationship || event.getThread()) continue;
+                            const room = client.getRoom(event.getRoomId());
+                            const thread = room?.findThreadForEvent(event);
+                            if (thread) {
+                                event.setThread(thread);
+                            } else {
+                                room?.createThread(event.getId()!, event, [], true);
                             }
                         }
+                    }
 
-                        setHighlights(highlights);
-                        setResults({ ...results }); // copy to force a refresh
-                        onUpdate(false, results);
+                    setHighlights(highlights);
+                    setResults({ ...results }); // copy to force a refresh
+                    onUpdate(false, results, null);
+                    return false;
+                },
+                (error) => {
+                    if (aborted.current) {
+                        logger.error("Discarding stale search results");
                         return false;
-                    },
-                    (error) => {
-                        if (aborted.current) {
-                            logger.error("Discarding stale search results");
-                            return false;
-                        }
-                        logger.error("Search failed", error);
-                        Modal.createDialog(ErrorDialog, {
-                            title: _t("error_dialog|search_failed|title"),
-                            description: error?.message ?? _t("error_dialog|search_failed|server_unavailable"),
-                        });
-                        onUpdate(false, null);
-                        return false;
-                    },
-                );
-            },
-            [client, term, onUpdate],
-        );
-
-        // Mount & unmount effect
-        useEffect(() => {
-            aborted.current = false;
-            handleSearchResult(promise);
-            return () => {
-                aborted.current = true;
-                abortController?.abort();
-            };
-        }, []); // eslint-disable-line react-hooks/exhaustive-deps
-
-        // show searching spinner
-        if (results === null) {
-            return (
-                <div
-                    className="mx_RoomView_messagePanel mx_RoomView_messagePanelSearchSpinner"
-                    data-testid="messagePanelSearchSpinner"
-                />
+                    }
+                    logger.error("Search failed", error);
+                    onUpdate(false, null, error);
+                    return false;
+                },
             );
-        }
+        },
+        [client, term, onUpdate],
+    );
 
-        const onSearchResultsFillRequest = async (backwards: boolean): Promise<boolean> => {
-            if (!backwards) {
-                return false;
-            }
-
-            if (!results.next_batch) {
-                debuglog("no more search results");
-                return false;
-            }
-
-            debuglog("requesting more search results");
-            const searchPromise = searchPagination(client, results);
-            return handleSearchResult(searchPromise);
+    // Mount & unmount effect
+    useEffect(() => {
+        aborted.current = false;
+        handleSearchResult(promise);
+        return () => {
+            aborted.current = true;
+            abortController?.abort();
         };
+    }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
-        const ret: JSX.Element[] = [];
+    // show searching spinner
+    if (results === null) {
+        return (
+            <div
+                className="mx_RoomView_messagePanel mx_RoomView_messagePanelSearchSpinner"
+                data-testid="messagePanelSearchSpinner"
+            />
+        );
+    }
 
-        if (inProgress) {
-            ret.push(
-                <li key="search-spinner">
-                    <Spinner />
-                </li>,
-            );
+    const onSearchResultsFillRequest = async (backwards: boolean): Promise<boolean> => {
+        if (!backwards) {
+            return false;
         }
 
         if (!results.next_batch) {
-            if (!results?.results?.length) {
+            debuglog("no more search results");
+            return false;
+        }
+
+        debuglog("requesting more search results");
+        const searchPromise = searchPagination(client, results);
+        return handleSearchResult(searchPromise);
+    };
+
+    const ret: JSX.Element[] = [];
+
+    if (inProgress) {
+        ret.push(
+            <li key="search-spinner">
+                <Spinner />
+            </li>,
+        );
+    }
+
+    if (!results.next_batch) {
+        if (!results?.results?.length) {
+            ret.push(
+                <li key="search-top-marker">
+                    <h2 className="mx_RoomView_topMarker">{_t("common|no_results")}</h2>
+                </li>,
+            );
+        } else {
+            ret.push(
+                <li key="search-top-marker">
+                    <h2 className="mx_RoomView_topMarker">{_t("no_more_results")}</h2>
+                </li>,
+            );
+        }
+    }
+
+    const onRef = (e: ScrollPanel | null): void => {
+        if (typeof ref === "function") {
+            ref(e);
+        } else if (!!ref) {
+            ref.current = e;
+        }
+        innerRef.current = e;
+    };
+
+    let lastRoomId: string | undefined;
+    let mergedTimeline: MatrixEvent[] = [];
+    let ourEventsIndexes: number[] = [];
+
+    for (let i = (results?.results?.length || 0) - 1; i >= 0; i--) {
+        const result = results.results[i];
+
+        const mxEv = result.context.getEvent();
+        const roomId = mxEv.getRoomId()!;
+        const room = client.getRoom(roomId);
+        if (!room) {
+            // if we do not have the room in js-sdk stores then hide it as we cannot easily show it
+            // As per the spec, an all rooms search can create this condition,
+            // it happens with Seshat but not Synapse.
+            // It will make the result count not match the displayed count.
+            logger.log("Hiding search result from an unknown room", roomId);
+            continue;
+        }
+
+        if (!haveRendererForEvent(mxEv, client, roomContext.showHiddenEvents)) {
+            // XXX: can this ever happen? It will make the result count
+            // not match the displayed count.
+            continue;
+        }
+
+        if (scope === SearchScope.All) {
+            if (roomId !== lastRoomId) {
                 ret.push(
-                    <li key="search-top-marker">
-                        <h2 className="mx_RoomView_topMarker">{_t("common|no_results")}</h2>
-                    </li>,
-                );
-            } else {
-                ret.push(
-                    <li key="search-top-marker">
-                        <h2 className="mx_RoomView_topMarker">{_t("no_more_results")}</h2>
+                    <li key={mxEv.getId() + "-room"}>
+                        <h2>
+                            {_t("common|room")}: {room.name}
+                        </h2>
                     </li>,
                 );
+                lastRoomId = roomId;
             }
         }
 
-        const onRef = (e: ScrollPanel | null): void => {
-            if (typeof ref === "function") {
-                ref(e);
-            } else if (!!ref) {
-                ref.current = e;
-            }
-            innerRef.current = e;
-        };
+        const resultLink = "#/room/" + roomId + "/" + mxEv.getId();
 
-        let lastRoomId: string | undefined;
-        let mergedTimeline: MatrixEvent[] = [];
-        let ourEventsIndexes: number[] = [];
-
-        for (let i = (results?.results?.length || 0) - 1; i >= 0; i--) {
-            const result = results.results[i];
-
-            const mxEv = result.context.getEvent();
-            const roomId = mxEv.getRoomId()!;
-            const room = client.getRoom(roomId);
-            if (!room) {
-                // if we do not have the room in js-sdk stores then hide it as we cannot easily show it
-                // As per the spec, an all rooms search can create this condition,
-                // it happens with Seshat but not Synapse.
-                // It will make the result count not match the displayed count.
-                logger.log("Hiding search result from an unknown room", roomId);
-                continue;
-            }
-
-            if (!haveRendererForEvent(mxEv, client, roomContext.showHiddenEvents)) {
-                // XXX: can this ever happen? It will make the result count
-                // not match the displayed count.
-                continue;
-            }
-
-            if (scope === SearchScope.All) {
-                if (roomId !== lastRoomId) {
-                    ret.push(
-                        <li key={mxEv.getId() + "-room"}>
-                            <h2>
-                                {_t("common|room")}: {room.name}
-                            </h2>
-                        </li>,
-                    );
-                    lastRoomId = roomId;
-                }
-            }
-
-            const resultLink = "#/room/" + roomId + "/" + mxEv.getId();
-
-            // merging two successive search result if the query is present in both of them
-            const currentTimeline = result.context.getTimeline();
-            const nextTimeline = i > 0 ? results.results[i - 1].context.getTimeline() : [];
-
-            if (i > 0 && currentTimeline[currentTimeline.length - 1].getId() == nextTimeline[0].getId()) {
-                // if this is the first searchResult we merge then add all values of the current searchResult
-                if (mergedTimeline.length == 0) {
-                    for (let j = mergedTimeline.length == 0 ? 0 : 1; j < result.context.getTimeline().length; j++) {
-                        mergedTimeline.push(currentTimeline[j]);
-                    }
-                    ourEventsIndexes.push(result.context.getOurEventIndex());
-                }
-
-                // merge the events of the next searchResult
-                for (let j = 1; j < nextTimeline.length; j++) {
-                    mergedTimeline.push(nextTimeline[j]);
-                }
-
-                // add the index of the matching event of the next searchResult
-                ourEventsIndexes.push(
-                    ourEventsIndexes[ourEventsIndexes.length - 1] +
-                        results.results[i - 1].context.getOurEventIndex() +
-                        1,
-                );
-
-                continue;
-            }
+        // merging two successive search result if the query is present in both of them
+        const currentTimeline = result.context.getTimeline();
+        const nextTimeline = i > 0 ? results.results[i - 1].context.getTimeline() : [];
 
+        if (i > 0 && currentTimeline[currentTimeline.length - 1].getId() == nextTimeline[0].getId()) {
+            // if this is the first searchResult we merge then add all values of the current searchResult
             if (mergedTimeline.length == 0) {
-                mergedTimeline = result.context.getTimeline();
-                ourEventsIndexes = [];
+                for (let j = mergedTimeline.length == 0 ? 0 : 1; j < result.context.getTimeline().length; j++) {
+                    mergedTimeline.push(currentTimeline[j]);
+                }
                 ourEventsIndexes.push(result.context.getOurEventIndex());
             }
 
-            let permalinkCreator = permalinkCreators.get(roomId);
-            if (!permalinkCreator) {
-                permalinkCreator = new RoomPermalinkCreator(room);
-                permalinkCreator.start();
-                permalinkCreators.set(roomId, permalinkCreator);
+            // merge the events of the next searchResult
+            for (let j = 1; j < nextTimeline.length; j++) {
+                mergedTimeline.push(nextTimeline[j]);
             }
 
-            ret.push(
-                <SearchResultTile
-                    key={mxEv.getId()}
-                    timeline={mergedTimeline}
-                    ourEventsIndexes={ourEventsIndexes}
-                    searchHighlights={highlights ?? []}
-                    resultLink={resultLink}
-                    permalinkCreator={permalinkCreator}
-                />,
+            // add the index of the matching event of the next searchResult
+            ourEventsIndexes.push(
+                ourEventsIndexes[ourEventsIndexes.length - 1] + results.results[i - 1].context.getOurEventIndex() + 1,
             );
 
-            ourEventsIndexes = [];
-            mergedTimeline = [];
+            continue;
         }
 
-        return (
-            <ScrollPanel
-                ref={onRef}
-                className={"mx_RoomView_searchResultsPanel " + className}
-                onFillRequest={onSearchResultsFillRequest}
-                resizeNotifier={resizeNotifier}
-            >
-                <li className="mx_RoomView_scrollheader" />
-                {ret}
-            </ScrollPanel>
+        if (mergedTimeline.length == 0) {
+            mergedTimeline = result.context.getTimeline();
+            ourEventsIndexes = [];
+            ourEventsIndexes.push(result.context.getOurEventIndex());
+        }
+
+        let permalinkCreator = permalinkCreators.get(roomId);
+        if (!permalinkCreator) {
+            permalinkCreator = new RoomPermalinkCreator(room);
+            permalinkCreator.start();
+            permalinkCreators.set(roomId, permalinkCreator);
+        }
+
+        ret.push(
+            <SearchResultTile
+                key={mxEv.getId()}
+                timeline={mergedTimeline}
+                ourEventsIndexes={ourEventsIndexes}
+                searchHighlights={highlights ?? []}
+                resultLink={resultLink}
+                permalinkCreator={permalinkCreator}
+            />,
         );
-    },
-);
+
+        ourEventsIndexes = [];
+        mergedTimeline = [];
+    }
+
+    return (
+        <ScrollPanel
+            ref={onRef}
+            className={"mx_RoomView_searchResultsPanel " + className}
+            onFillRequest={onSearchResultsFillRequest}
+            resizeNotifier={resizeNotifier}
+        >
+            <li className="mx_RoomView_scrollheader" />
+            {ret}
+        </ScrollPanel>
+    );
+};
diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index b86e7937e8..d64f4b7a36 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -10,7 +10,6 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, {
-    type ChangeEvent,
     type ComponentProps,
     createRef,
     type ReactElement,
@@ -120,8 +119,6 @@ import { isVideoRoom } from "../../utils/video-rooms";
 import { SDKContext } from "../../contexts/SDKContext";
 import { RoomSearchView } from "./RoomSearchView";
 import eventSearch, { type SearchInfo, SearchScope } from "../../Searching";
-import VoipUserMapper from "../../VoipUserMapper";
-import { isCallEvent } from "./LegacyCallEventGrouper";
 import { WidgetType } from "../../widgets/WidgetType";
 import WidgetUtils from "../../utils/WidgetUtils";
 import { shouldEncryptRoomWithSingle3rdPartyInvite } from "../../utils/room/shouldEncryptRoomWithSingle3rdPartyInvite";
@@ -134,6 +131,8 @@ import { onView3pidInvite } from "../../stores/right-panel/action-handlers";
 import RoomSearchAuxPanel from "../views/rooms/RoomSearchAuxPanel";
 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";
 
 const DEBUG = false;
 const PREVENT_MULTIPLE_JITSI_WITHIN = 30_000;
@@ -164,7 +163,6 @@ export { MainSplitContentType };
 
 export interface IRoomState {
     room?: Room;
-    virtualRoom?: Room;
     roomId?: string;
     roomAlias?: string;
     roomLoading: boolean;
@@ -372,6 +370,10 @@ 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;
@@ -1246,6 +1248,11 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
             case Action.View3pidInvite:
                 onView3pidInvite(payload, RightPanelStore.instance);
                 break;
+            case Action.FocusMessageSearch:
+                if ((payload as FocusMessageSearchPayload).initialText) {
+                    this.onSearch(payload.initialText);
+                }
+                break;
         }
     };
 
@@ -1343,16 +1350,15 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         return this.messagePanel.canResetTimeline();
     };
 
-    private loadVirtualRoom = async (room?: Room): Promise<void> => {
-        const virtualRoom = room?.roomId && (await VoipUserMapper.sharedInstance().getVirtualRoomForRoom(room?.roomId));
-
-        this.setState({ virtualRoom: virtualRoom || undefined });
-    };
-
     // called when state.room is first initialised (either at initial load,
     // 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);
 
@@ -1361,7 +1367,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.calculateRecommendedVersion(room);
         this.updatePermissions(room);
         this.checkWidgets(room);
-        this.loadVirtualRoom(room);
         this.updateRoomEncrypted(room);
 
         if (
@@ -1715,11 +1720,12 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         this.onSearch(this.state.search?.term ?? "", scope);
     };
 
-    private onSearchUpdate = (inProgress: boolean, searchResults: ISearchResults | null): void => {
+    private onSearchUpdate = (inProgress: boolean, searchResults: ISearchResults | null, error: Error | null): void => {
         this.setState({
             search: {
                 ...this.state.search!,
                 count: searchResults?.count,
+                error: error ?? undefined,
                 inProgress,
             },
         });
@@ -1732,48 +1738,92 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         });
     };
 
-    private onRejectButtonClicked = (): void => {
-        const roomId = this.getRoomId();
-        if (!roomId) return;
+    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;
+        if (!shouldReject) {
+            return;
+        }
+
         this.setState({
             rejecting: true,
         });
-        this.context.client?.leave(roomId).then(
-            () => {
-                defaultDispatcher.dispatch({ action: Action.ViewHomePage });
-                this.setState({
-                    rejecting: false,
-                });
-            },
-            (error) => {
-                logger.error(`Failed to reject invite: ${error}`);
 
-                const msg = error.message ? error.message : JSON.stringify(error);
-                Modal.createDialog(ErrorDialog, {
-                    title: _t("room|failed_reject_invite"),
-                    description: msg,
-                });
+        const actions: Promise<unknown>[] = [];
 
-                this.setState({
-                    rejecting: false,
-                });
-            },
-        );
+        if (ignoreUser) {
+            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) {
+            actions.push(this.context.client.reportRoom(this.state.room.roomId, reportRoom!));
+        }
+
+        actions.push(this.context.client.leave(this.state.room.roomId));
+        try {
+            await Promise.all(actions);
+            defaultDispatcher.dispatch({ action: Action.ViewHomePage });
+            this.setState({
+                rejecting: false,
+            });
+        } catch (error) {
+            logger.error(`Failed to reject invite: ${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,
+            });
+
+            this.setState({
+                rejecting: false,
+            });
+        }
     };
 
-    private onRejectAndIgnoreClick = async (): Promise<void> => {
-        this.setState({
-            rejecting: true,
-        });
-
+    private onDeclineButtonClicked = async (): Promise<void> => {
+        if (!this.state.room || !this.context.client) {
+            return;
+        }
         try {
-            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
-            await this.context.client!.setIgnoredUsers(ignoredUsers);
-
-            await this.context.client!.leave(this.state.roomId!);
+            this.setState({
+                rejecting: true,
+            });
+            await this.context.client.leave(this.state.room.roomId);
             defaultDispatcher.dispatch({ action: Action.ViewHomePage });
             this.setState({
                 rejecting: false,
@@ -1801,8 +1851,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         defaultDispatcher.fire(Action.ViewRoomDirectory);
     };
 
-    private onSearchChange = debounce((e: ChangeEvent): void => {
-        const term = (e.target as HTMLInputElement).value;
+    private onSearchChange = debounce((term: string): void => {
         this.onSearch(term);
     }, 300);
 
@@ -2126,7 +2175,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                             <RoomPreviewBar
                                 onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
-                                onRejectClick={this.onRejectThreepidInviteButtonClicked}
+                                onDeclineClick={this.onRejectThreepidInviteButtonClicked}
                                 canPreview={false}
                                 error={this.state.roomLoadError}
                                 roomAlias={roomAlias}
@@ -2154,7 +2203,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                         <RoomPreviewCard
                             room={this.state.room}
                             onJoinButtonClicked={this.onJoinButtonClicked}
-                            onRejectButtonClicked={this.onRejectButtonClicked}
+                            onRejectButtonClicked={this.onDeclineButtonClicked}
                         />
                     </div>
                     ;
@@ -2196,8 +2245,9 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                             <RoomPreviewBar
                                 onJoinClick={this.onJoinButtonClicked}
                                 onForgetClick={this.onForgetClick}
-                                onRejectClick={this.onRejectButtonClicked}
-                                onRejectAndIgnoreClick={this.onRejectAndIgnoreClick}
+                                onDeclineClick={this.onDeclineButtonClicked}
+                                onDeclineAndBlockClick={this.onDeclineAndBlockButtonClicked}
+                                promptRejectionOptions={true}
                                 inviterName={inviterName}
                                 canPreview={false}
                                 joining={this.state.joining}
@@ -2312,7 +2362,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 <RoomPreviewBar
                     onJoinClick={this.onJoinButtonClicked}
                     onForgetClick={this.onForgetClick}
-                    onRejectClick={this.onRejectThreepidInviteButtonClicked}
+                    onDeclineClick={this.onRejectThreepidInviteButtonClicked}
+                    promptRejectionOptions={true}
                     joining={this.state.joining}
                     inviterName={inviterName}
                     invitedEmail={invitedEmail}
@@ -2350,7 +2401,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                     onRejectButtonClicked={
                         this.props.threepidInvite
                             ? this.onRejectThreepidInviteButtonClicked
-                            : this.onRejectButtonClicked
+                            : this.onDeclineButtonClicked
                     }
                 />
             );
@@ -2427,8 +2478,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 <TimelinePanel
                     ref={this.gatherTimelinePanelRef}
                     timelineSet={this.state.room.getUnfilteredTimelineSet()}
-                    overlayTimelineSet={this.state.virtualRoom?.getUnfilteredTimelineSet()}
-                    overlayTimelineSetFilter={isCallEvent}
                     showReadReceipts={this.state.showReadReceipts}
                     manageReadReceipts={!this.state.isPeeking}
                     sendReadReceiptOnLoad={!this.state.wasContextSwitch}
@@ -2482,6 +2531,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
                 e2eStatus={this.state.e2eStatus}
                 onSearchChange={this.onSearchChange}
                 onSearchCancel={this.onCancelSearchClick}
+                searchTerm={this.state.search?.term ?? ""}
             />
         ) : undefined;
 
@@ -2602,3 +2652,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
         );
     }
 }
+
+class CannotDetermineUserError extends Error {
+    public name = "CannotDetermineUserError";
+}
diff --git a/src/components/structures/TabbedView.tsx b/src/components/structures/TabbedView.tsx
index 4b842eaff1..b01f160551 100644
--- a/src/components/structures/TabbedView.tsx
+++ b/src/components/structures/TabbedView.tsx
@@ -27,14 +27,14 @@ export class Tab<T extends string> {
      * @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 {React.ReactNode} body The JSX for the tab container.
+     * @param {JSX.Element} body The JSX for the tab container.
      * @param {string} screenName The screen name to report to Posthog.
      */
     public constructor(
         public readonly id: T,
         public readonly label: TranslationKey,
         public readonly icon: string | JSX.Element | null,
-        public readonly body: React.ReactNode,
+        public readonly body: JSX.Element,
         public readonly screenName?: ScreenName,
     ) {}
 }
diff --git a/src/components/structures/TimelinePanel.tsx b/src/components/structures/TimelinePanel.tsx
index c41240079a..8346a0ab31 100644
--- a/src/components/structures/TimelinePanel.tsx
+++ b/src/components/structures/TimelinePanel.tsx
@@ -30,7 +30,7 @@ import {
     ThreadEvent,
     ReceiptType,
 } from "matrix-js-sdk/src/matrix";
-import { debounce, findLastIndex } from "lodash";
+import { debounce } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "../../settings/SettingsStore";
@@ -73,25 +73,12 @@ const debuglog = (...args: any[]): void => {
     }
 };
 
-const overlaysBefore = (overlayEvent: MatrixEvent, mainEvent: MatrixEvent): boolean =>
-    overlayEvent.localTimestamp < mainEvent.localTimestamp;
-
-const overlaysAfter = (overlayEvent: MatrixEvent, mainEvent: MatrixEvent): boolean =>
-    overlayEvent.localTimestamp >= mainEvent.localTimestamp;
-
 interface IProps {
     // The js-sdk EventTimelineSet object for the timeline sequence we are
     // representing.  This may or may not have a room, depending on what it's
     // a timeline representing.  If it has a room, we maintain RRs etc for
     // that room.
     timelineSet: EventTimelineSet;
-    // overlay events from a second timelineset on the main timeline
-    // added to support virtual rooms
-    // events from the overlay timeline set will be added by localTimestamp
-    // into the main timeline
-    overlayTimelineSet?: EventTimelineSet;
-    // filter events from overlay timeline
-    overlayTimelineSetFilter?: (event: MatrixEvent) => boolean;
     showReadReceipts?: boolean;
     // Enable managing RRs and RMs. These require the timelineSet to have a room.
     manageReadReceipts?: boolean;
@@ -251,7 +238,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
     private readonly messagePanel = createRef<MessagePanel>();
     private dispatcherRef?: string;
     private timelineWindow?: TimelineWindow;
-    private overlayTimelineWindow?: TimelineWindow;
     private unmounted = false;
     private readReceiptActivityTimer: Timer | null = null;
     private readMarkerActivityTimer: Timer | null = null;
@@ -349,16 +335,12 @@ class TimelinePanel extends React.Component<IProps, IState> {
         const differentEventId = prevProps.eventId != this.props.eventId;
         const differentHighlightedEventId = prevProps.highlightedEventId != this.props.highlightedEventId;
         const differentAvoidJump = prevProps.eventScrollIntoView && !this.props.eventScrollIntoView;
-        const differentOverlayTimeline = prevProps.overlayTimelineSet !== this.props.overlayTimelineSet;
         if (differentEventId || differentHighlightedEventId || differentAvoidJump) {
             logger.log(
                 `TimelinePanel switching to eventId ${this.props.eventId} (was ${prevProps.eventId}), ` +
                     `scrollIntoView: ${this.props.eventScrollIntoView} (was ${prevProps.eventScrollIntoView})`,
             );
             this.initTimeline(this.props);
-        } else if (differentOverlayTimeline) {
-            logger.log(`TimelinePanel updating overlay timeline.`);
-            this.initTimeline(this.props);
         }
     }
 
@@ -509,24 +491,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
         // this particular event should be the first or last to be unpaginated.
         const eventId = scrollToken;
 
-        // The event in question could belong to either the main timeline or
-        // overlay timeline; let's check both
         const mainEvents = this.timelineWindow!.getEvents();
-        const overlayEvents = this.overlayTimelineWindow?.getEvents() ?? [];
 
-        let marker = mainEvents.findIndex((ev) => ev.getId() === eventId);
-        let overlayMarker: number;
-        if (marker === -1) {
-            // The event must be from the overlay timeline instead
-            overlayMarker = overlayEvents.findIndex((ev) => ev.getId() === eventId);
-            marker = backwards
-                ? findLastIndex(mainEvents, (ev) => overlaysAfter(overlayEvents[overlayMarker], ev))
-                : mainEvents.findIndex((ev) => overlaysBefore(overlayEvents[overlayMarker], ev));
-        } else {
-            overlayMarker = backwards
-                ? findLastIndex(overlayEvents, (ev) => overlaysBefore(ev, mainEvents[marker]))
-                : overlayEvents.findIndex((ev) => overlaysAfter(ev, mainEvents[marker]));
-        }
+        const marker = mainEvents.findIndex((ev) => ev.getId() === eventId);
 
         // The number of events to unpaginate from the main timeline
         let count: number;
@@ -536,24 +503,11 @@ class TimelinePanel extends React.Component<IProps, IState> {
             count = backwards ? marker + 1 : mainEvents.length - marker;
         }
 
-        // The number of events to unpaginate from the overlay timeline
-        let overlayCount: number;
-        if (overlayMarker === -1) {
-            overlayCount = 0;
-        } else {
-            overlayCount = backwards ? overlayMarker + 1 : overlayEvents.length - overlayMarker;
-        }
-
         if (count > 0) {
             debuglog("Unpaginating", count, "in direction", dir);
             this.timelineWindow!.unpaginate(count, backwards);
         }
 
-        if (overlayCount > 0) {
-            debuglog("Unpaginating", count, "from overlay timeline in direction", dir);
-            this.overlayTimelineWindow!.unpaginate(overlayCount, backwards);
-        }
-
         const { events, liveEvents } = this.getEvents();
         this.buildLegacyCallEventGroupers(events);
         this.setState({
@@ -610,10 +564,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 return false;
             }
 
-            if (this.overlayTimelineWindow) {
-                await this.extendOverlayWindowToCoverMainWindow();
-            }
-
             debuglog("paginate complete backwards:" + backwards + "; success:" + r);
 
             const { events, liveEvents } = this.getEvents();
@@ -705,10 +655,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         data: IRoomTimelineData,
     ): void => {
         // ignore events for other timeline sets
-        if (
-            data.timeline.getTimelineSet() !== this.props.timelineSet &&
-            data.timeline.getTimelineSet() !== this.props.overlayTimelineSet
-        ) {
+        if (data.timeline.getTimelineSet() !== this.props.timelineSet) {
             return;
         }
 
@@ -748,69 +695,60 @@ class TimelinePanel extends React.Component<IProps, IState> {
         // timeline window.
         //
         // see https://github.com/vector-im/vector-web/issues/1035
-        this.timelineWindow!.paginate(EventTimeline.FORWARDS, 1, false)
-            .then(() => {
-                if (this.overlayTimelineWindow) {
-                    return this.overlayTimelineWindow.paginate(EventTimeline.FORWARDS, 1, false);
+        this.timelineWindow!.paginate(EventTimeline.FORWARDS, 1, false).then(() => {
+            if (this.unmounted) {
+                return;
+            }
+
+            const { events, liveEvents } = this.getEvents();
+            this.buildLegacyCallEventGroupers(events);
+            const lastLiveEvent = liveEvents[liveEvents.length - 1];
+
+            const updatedState: Partial<IState> = {
+                events,
+                liveEvents,
+            };
+
+            let callRMUpdated = false;
+            if (this.props.manageReadMarkers) {
+                // when a new event arrives when the user is not watching the
+                // window, but the window is in its auto-scroll mode, make sure the
+                // read marker is visible.
+                //
+                // We ignore events we have sent ourselves; we don't want to see the
+                // read-marker when a remote echo of an event we have just sent takes
+                // more than the timeout on userActiveRecently.
+                //
+                const myUserId = MatrixClientPeg.safeGet().credentials.userId;
+                callRMUpdated = false;
+                if (ev.getSender() !== myUserId && !UserActivity.sharedInstance().userActiveRecently()) {
+                    updatedState.readMarkerVisible = true;
+                } else if (lastLiveEvent && this.getReadMarkerPosition() === 0) {
+                    // we know we're stuckAtBottom, so we can advance the RM
+                    // immediately, to save a later render cycle
+
+                    this.setReadMarker(lastLiveEvent.getId() ?? null, lastLiveEvent.getTs(), true);
+                    updatedState.readMarkerVisible = false;
+                    updatedState.readMarkerEventId = lastLiveEvent.getId();
+                    callRMUpdated = true;
                 }
-            })
-            .then(() => {
-                if (this.unmounted) {
-                    return;
+            }
+
+            this.setState(updatedState as IState, () => {
+                this.messagePanel.current?.updateTimelineMinHeight();
+                if (callRMUpdated) {
+                    this.props.onReadMarkerUpdated?.();
                 }
-
-                const { events, liveEvents } = this.getEvents();
-                this.buildLegacyCallEventGroupers(events);
-                const lastLiveEvent = liveEvents[liveEvents.length - 1];
-
-                const updatedState: Partial<IState> = {
-                    events,
-                    liveEvents,
-                };
-
-                let callRMUpdated = false;
-                if (this.props.manageReadMarkers) {
-                    // when a new event arrives when the user is not watching the
-                    // window, but the window is in its auto-scroll mode, make sure the
-                    // read marker is visible.
-                    //
-                    // We ignore events we have sent ourselves; we don't want to see the
-                    // read-marker when a remote echo of an event we have just sent takes
-                    // more than the timeout on userActiveRecently.
-                    //
-                    const myUserId = MatrixClientPeg.safeGet().credentials.userId;
-                    callRMUpdated = false;
-                    if (ev.getSender() !== myUserId && !UserActivity.sharedInstance().userActiveRecently()) {
-                        updatedState.readMarkerVisible = true;
-                    } else if (lastLiveEvent && this.getReadMarkerPosition() === 0) {
-                        // we know we're stuckAtBottom, so we can advance the RM
-                        // immediately, to save a later render cycle
-
-                        this.setReadMarker(lastLiveEvent.getId() ?? null, lastLiveEvent.getTs(), true);
-                        updatedState.readMarkerVisible = false;
-                        updatedState.readMarkerEventId = lastLiveEvent.getId();
-                        callRMUpdated = true;
-                    }
-                }
-
-                this.setState(updatedState as IState, () => {
-                    this.messagePanel.current?.updateTimelineMinHeight();
-                    if (callRMUpdated) {
-                        this.props.onReadMarkerUpdated?.();
-                    }
-                });
             });
+        });
     };
 
     private hasTimelineSetFor(roomId: string | undefined): boolean {
-        return (
-            (roomId !== undefined && roomId === this.props.timelineSet.room?.roomId) ||
-            roomId === this.props.overlayTimelineSet?.room?.roomId
-        );
+        return roomId !== undefined && roomId === this.props.timelineSet.room?.roomId;
     }
 
     private onRoomTimelineReset = (room: Room | undefined, timelineSet: EventTimelineSet): void => {
-        if (timelineSet !== this.props.timelineSet && timelineSet !== this.props.overlayTimelineSet) return;
+        if (timelineSet !== this.props.timelineSet) return;
 
         if (this.canResetTimeline()) {
             this.loadTimeline();
@@ -1475,48 +1413,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
         });
     }
 
-    private async extendOverlayWindowToCoverMainWindow(): Promise<void> {
-        const mainWindow = this.timelineWindow!;
-        const overlayWindow = this.overlayTimelineWindow!;
-        const mainEvents = mainWindow.getEvents();
-
-        if (mainEvents.length > 0) {
-            let paginationRequests: Promise<unknown>[];
-
-            // Keep paginating until the main window is covered
-            do {
-                paginationRequests = [];
-                const overlayEvents = overlayWindow.getEvents();
-
-                if (
-                    overlayWindow.canPaginate(EventTimeline.BACKWARDS) &&
-                    (overlayEvents.length === 0 ||
-                        overlaysAfter(overlayEvents[0], mainEvents[0]) ||
-                        !mainWindow.canPaginate(EventTimeline.BACKWARDS))
-                ) {
-                    // Paginating backwards could reveal more events to be overlaid in the main window
-                    paginationRequests.push(
-                        this.onPaginationRequest(overlayWindow, EventTimeline.BACKWARDS, PAGINATE_SIZE),
-                    );
-                }
-
-                if (
-                    overlayWindow.canPaginate(EventTimeline.FORWARDS) &&
-                    (overlayEvents.length === 0 ||
-                        overlaysBefore(overlayEvents.at(-1)!, mainEvents.at(-1)!) ||
-                        !mainWindow.canPaginate(EventTimeline.FORWARDS))
-                ) {
-                    // Paginating forwards could reveal more events to be overlaid in the main window
-                    paginationRequests.push(
-                        this.onPaginationRequest(overlayWindow, EventTimeline.FORWARDS, PAGINATE_SIZE),
-                    );
-                }
-
-                await Promise.all(paginationRequests);
-            } while (paginationRequests.length > 0);
-        }
-    }
-
     /**
      * (re)-load the event timeline, and initialise the scroll state, centered
      * around the given event.
@@ -1536,9 +1432,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
     private loadTimeline(eventId?: string, pixelOffset?: number, offsetBase?: number, scrollIntoView = true): void {
         const cli = MatrixClientPeg.safeGet();
         this.timelineWindow = new TimelineWindow(cli, this.props.timelineSet, { windowLimit: this.props.timelineCap });
-        this.overlayTimelineWindow = this.props.overlayTimelineSet
-            ? new TimelineWindow(cli, this.props.overlayTimelineSet, { windowLimit: this.props.timelineCap })
-            : undefined;
 
         const onLoaded = (): void => {
             if (this.unmounted) return;
@@ -1554,14 +1447,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
             this.setState(
                 {
-                    canBackPaginate:
-                        (this.timelineWindow?.canPaginate(EventTimeline.BACKWARDS) ||
-                            this.overlayTimelineWindow?.canPaginate(EventTimeline.BACKWARDS)) ??
-                        false,
-                    canForwardPaginate:
-                        (this.timelineWindow?.canPaginate(EventTimeline.FORWARDS) ||
-                            this.overlayTimelineWindow?.canPaginate(EventTimeline.FORWARDS)) ??
-                        false,
+                    canBackPaginate: this.timelineWindow?.canPaginate(EventTimeline.BACKWARDS) ?? false,
+                    canForwardPaginate: this.timelineWindow?.canPaginate(EventTimeline.FORWARDS) ?? false,
                     timelineLoading: false,
                 },
                 () => {
@@ -1618,11 +1505,13 @@ class TimelinePanel extends React.Component<IProps, IState> {
                 description = _t("timeline|load_error|unable_to_find");
             }
 
-            Modal.createDialog(ErrorDialog, {
+            const { finished } = Modal.createDialog(ErrorDialog, {
                 title: _t("timeline|load_error|title"),
                 description,
-                onFinished,
             });
+            if (onFinished) {
+                finished.then(onFinished);
+            }
         };
 
         // if we already have the event in question, TimelineWindow.load
@@ -1636,7 +1525,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
         // This is a hot-path optimization by skipping a promise tick
         // by repeating a no-op sync branch in
         // TimelineSet.getTimelineForEvent & MatrixClient.getEventTimeline
-        if (this.props.timelineSet.getTimelineForEvent(eventId) && !this.overlayTimelineWindow) {
+        if (this.props.timelineSet.getTimelineForEvent(eventId)) {
             // if we've got an eventId, and the timeline exists, we can skip
             // the promise tick.
             this.timelineWindow.load(eventId, INITIAL_SIZE);
@@ -1645,14 +1534,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
             return;
         }
 
-        const prom = this.timelineWindow.load(eventId, INITIAL_SIZE).then(async (): Promise<void> => {
-            if (this.overlayTimelineWindow) {
-                // TODO: use timestampToEvent to load the overlay timeline
-                // with more correct position when main TL eventId is truthy
-                await this.overlayTimelineWindow.load(undefined, INITIAL_SIZE);
-                await this.extendOverlayWindowToCoverMainWindow();
-            }
-        });
+        const prom = this.timelineWindow.load(eventId, INITIAL_SIZE);
         this.buildLegacyCallEventGroupers();
         this.setState({
             events: [],
@@ -1683,38 +1565,9 @@ class TimelinePanel extends React.Component<IProps, IState> {
         this.reloadEvents();
     }
 
-    // get the list of events from the timeline windows and the pending event list
+    // get the list of events from the timeline window and the pending event list
     private getEvents(): Pick<IState, "events" | "liveEvents"> {
-        const mainEvents = this.timelineWindow!.getEvents();
-        let overlayEvents = this.overlayTimelineWindow?.getEvents() ?? [];
-        if (this.props.overlayTimelineSetFilter !== undefined) {
-            overlayEvents = overlayEvents.filter(this.props.overlayTimelineSetFilter);
-        }
-
-        // maintain the main timeline event order as returned from the HS
-        // merge overlay events at approximately the right position based on local timestamp
-        const events = overlayEvents.reduce(
-            (acc: MatrixEvent[], overlayEvent: MatrixEvent) => {
-                // find the first main tl event with a later timestamp
-                const index = acc.findIndex((event) => overlaysBefore(overlayEvent, event));
-                // insert overlay event into timeline at approximately the right place
-                // if it's beyond the edge of the main window, hide it so that expanding
-                // the main window doesn't cause new events to pop in and change its position
-                if (index === -1) {
-                    if (!this.timelineWindow!.canPaginate(EventTimeline.FORWARDS)) {
-                        acc.push(overlayEvent);
-                    }
-                } else if (index === 0) {
-                    if (!this.timelineWindow!.canPaginate(EventTimeline.BACKWARDS)) {
-                        acc.unshift(overlayEvent);
-                    }
-                } else {
-                    acc.splice(index, 0, overlayEvent);
-                }
-                return acc;
-            },
-            [...mainEvents],
-        );
+        const events = this.timelineWindow!.getEvents();
 
         // We want the last event to be decrypted first
         const client = MatrixClientPeg.safeGet();
diff --git a/src/components/structures/auth/CompleteSecurity.tsx b/src/components/structures/auth/CompleteSecurity.tsx
index a0f2be8836..5bade7b24a 100644
--- a/src/components/structures/auth/CompleteSecurity.tsx
+++ b/src/components/structures/auth/CompleteSecurity.tsx
@@ -78,9 +78,6 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         } else if (phase === Phase.Busy) {
             icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
             title = _t("encryption|verification|after_new_login|verify_this_device");
-        } else if (phase === Phase.ConfirmReset) {
-            icon = <span className="mx_CompleteSecurity_headerIcon mx_E2EIcon_warning" />;
-            title = _t("encryption|verification|after_new_login|reset_confirmation");
         } else if (phase === Phase.Finished) {
             // SetupEncryptionBody will take care of calling onFinished, we don't need to do anything
         } else {
@@ -90,7 +87,7 @@ export default class CompleteSecurity extends React.Component<IProps, IState> {
         const forceVerification = SdkConfig.get("force_verification");
 
         let skipButton;
-        if (!forceVerification && (phase === Phase.Intro || phase === Phase.ConfirmReset)) {
+        if (!forceVerification && phase === Phase.Intro) {
             skipButton = (
                 <AccessibleButton
                     onClick={this.onSkipClick}
diff --git a/src/components/structures/auth/LoginSplashView.tsx b/src/components/structures/auth/LoginSplashView.tsx
index 62e5734e19..aae7980185 100644
--- a/src/components/structures/auth/LoginSplashView.tsx
+++ b/src/components/structures/auth/LoginSplashView.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 JSX } from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
 
@@ -43,13 +43,13 @@ type MigrationState = {
 /**
  * The view that is displayed after we have logged in, before the first /sync is completed.
  */
-export function LoginSplashView(props: Props): React.JSX.Element {
+export function LoginSplashView(props: Props): JSX.Element {
     const migrationState = useTypedEventEmitterState(
         props.matrixClient,
         CryptoEvent.LegacyCryptoStoreMigrationProgress,
         (progress?: number, total?: number): MigrationState => ({ progress: progress ?? -1, totalSteps: total ?? -1 }),
     );
-    let errorBox: React.JSX.Element | undefined;
+    let errorBox: JSX.Element | undefined;
     if (props.syncError) {
         errorBox = <div className="mx_LoginSplashView_syncError">{messageForSyncError(props.syncError)}</div>;
     }
diff --git a/src/components/structures/auth/SetupEncryptionBody.tsx b/src/components/structures/auth/SetupEncryptionBody.tsx
index b91b99c921..b76a623e2c 100644
--- a/src/components/structures/auth/SetupEncryptionBody.tsx
+++ b/src/components/structures/auth/SetupEncryptionBody.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -19,6 +19,7 @@ import { SetupEncryptionStore, Phase } from "../../../stores/SetupEncryptionStor
 import EncryptionPanel from "../../views/right_panel/EncryptionPanel";
 import AccessibleButton, { type ButtonEvent } 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);
@@ -89,14 +90,15 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
         // We need to call onFinished now to close this dialog, and
         // again later to signal that the verification is complete.
         this.props.onFinished();
-        Modal.createDialog(VerificationRequestDialog, {
+        const { finished: verificationFinished } = Modal.createDialog(VerificationRequestDialog, {
             verificationRequestPromise: requestPromise,
             member: cli.getUser(userId) ?? undefined,
-            onFinished: async (): Promise<void> => {
-                const request = await requestPromise;
-                request.cancel();
-                this.props.onFinished();
-            },
+        });
+
+        verificationFinished.then(async () => {
+            const request = await requestPromise;
+            request.cancel();
+            this.props.onFinished();
         });
     };
 
@@ -112,19 +114,15 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
 
     private onResetClick = (ev: ButtonEvent): void => {
         ev.preventDefault();
-        const store = SetupEncryptionStore.sharedInstance();
-        store.reset();
-    };
-
-    private onResetConfirmClick = (): void => {
-        this.props.onFinished();
-        const store = SetupEncryptionStore.sharedInstance();
-        store.resetConfirm();
-    };
-
-    private onResetBackClick = (): void => {
-        const store = SetupEncryptionStore.sharedInstance();
-        store.returnAfterReset();
+        Modal.createDialog(ResetIdentityDialog, {
+            onReset: () => {
+                // The user completed the reset process - close this dialog
+                this.props.onFinished();
+                const store = SetupEncryptionStore.sharedInstance();
+                store.done();
+            },
+            variant: "confirm",
+        });
     };
 
     private onDoneClick = (): void => {
@@ -157,7 +155,7 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                         <p>{_t("encryption|verification|no_key_or_device")}</p>
 
                         <div className="mx_CompleteSecurity_actionRow">
-                            <AccessibleButton kind="primary" onClick={this.onResetConfirmClick}>
+                            <AccessibleButton kind="primary" onClick={this.onResetClick}>
                                 {_t("encryption|verification|reset_proceed_prompt")}
                             </AccessibleButton>
                         </div>
@@ -246,22 +244,6 @@ export default class SetupEncryptionBody extends React.Component<IProps, IState>
                     </div>
                 </div>
             );
-        } else if (phase === Phase.ConfirmReset) {
-            return (
-                <div>
-                    <p>{_t("encryption|verification|verify_reset_warning_1")}</p>
-                    <p>{_t("encryption|verification|verify_reset_warning_2")}</p>
-
-                    <div className="mx_CompleteSecurity_actionRow">
-                        <AccessibleButton kind="danger_outline" onClick={this.onResetConfirmClick}>
-                            {_t("encryption|verification|reset_proceed_prompt")}
-                        </AccessibleButton>
-                        <AccessibleButton kind="primary" onClick={this.onResetBackClick}>
-                            {_t("action|go_back")}
-                        </AccessibleButton>
-                    </div>
-                </div>
-            );
         } else if (phase === Phase.Busy || phase === Phase.Loading) {
             return <Spinner />;
         } else {
diff --git a/src/components/structures/auth/SoftLogout.tsx b/src/components/structures/auth/SoftLogout.tsx
index 7ebcc7af6a..34fabe46c7 100644
--- a/src/components/structures/auth/SoftLogout.tsx
+++ b/src/components/structures/auth/SoftLogout.tsx
@@ -89,13 +89,12 @@ export default class SoftLogout extends React.Component<IProps, IState> {
     }
 
     private onClearAll = (): void => {
-        Modal.createDialog(ConfirmWipeDeviceDialog, {
-            onFinished: (wipeData) => {
-                if (!wipeData) return;
+        const { finished } = Modal.createDialog(ConfirmWipeDeviceDialog);
+        finished.then(([wipeData]) => {
+            if (!wipeData) return;
 
-                logger.log("Clearing data from soft-logged-out session");
-                Lifecycle.logout(this.context.oidcClientStore);
-            },
+            logger.log("Clearing data from soft-logged-out session");
+            Lifecycle.logout(this.context.oidcClientStore);
         });
     };
 
@@ -168,7 +167,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             return;
         }
 
-        Lifecycle.setLoggedIn(credentials).catch((e) => {
+        Lifecycle.hydrateSession(credentials).catch((e) => {
             logger.error(e);
             this.setState({ busy: false, errorText: _t("auth|failed_soft_logout_auth") });
         });
@@ -204,7 +203,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
             return false;
         }
 
-        return Lifecycle.setLoggedIn(credentials)
+        return Lifecycle.hydrateSession(credentials)
             .then(() => {
                 if (this.props.onTokenLoginCompleted) {
                     this.props.onTokenLoginCompleted();
diff --git a/src/components/structures/auth/header/AuthHeaderContext.tsx b/src/components/structures/auth/header/AuthHeaderContext.tsx
index 768060b654..a45233564b 100644
--- a/src/components/structures/auth/header/AuthHeaderContext.tsx
+++ b/src/components/structures/auth/header/AuthHeaderContext.tsx
@@ -6,10 +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 { createContext, type Dispatch, type ReducerAction, type ReducerState } from "react";
+import { createContext, type Dispatch, type Reducer, type ReducerState } from "react";
 
 import type { AuthHeaderReducer } from "./AuthHeaderProvider";
 
+type ReducerAction<R extends Reducer<any, any>> = R extends Reducer<any, infer A> ? A : never;
+
 interface AuthHeaderContextType {
     state: ReducerState<AuthHeaderReducer>;
     dispatch: Dispatch<ReducerAction<AuthHeaderReducer>>;
diff --git a/src/components/structures/auth/header/AuthHeaderProvider.tsx b/src/components/structures/auth/header/AuthHeaderProvider.tsx
index ad1ff5b0cc..50a53b95c3 100644
--- a/src/components/structures/auth/header/AuthHeaderProvider.tsx
+++ b/src/components/structures/auth/header/AuthHeaderProvider.tsx
@@ -25,7 +25,7 @@ interface AuthHeaderAction {
 export type AuthHeaderReducer = Reducer<ComponentProps<typeof AuthHeaderModifier>[], AuthHeaderAction>;
 
 export function AuthHeaderProvider({ children }: PropsWithChildren): JSX.Element {
-    const [state, dispatch] = useReducer<AuthHeaderReducer>(
+    const [state, dispatch] = useReducer<ComponentProps<typeof AuthHeaderModifier>[], [AuthHeaderAction]>(
         (state: ComponentProps<typeof AuthHeaderModifier>[], action: AuthHeaderAction) => {
             switch (action.type) {
                 case AuthHeaderActionType.Add:
diff --git a/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx b/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx
new file mode 100644
index 0000000000..3832616a9c
--- /dev/null
+++ b/src/components/viewmodels/avatars/RoomAvatarViewModel.tsx
@@ -0,0 +1,89 @@
+/*
+ * 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, JoinRule, type MatrixEvent, type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+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 {
+    /**
+     * 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;
+}
+
+/**
+ * Hook to get the state of the room avatar.
+ * @param room
+ */
+export function useRoomAvatarViewModel(room: Room): RoomAvatarViewState {
+    const isVideoRoom = room.isElementVideoRoom() || room.isCallRoom();
+    const roomMember = useDmMember(room);
+    const presence = usePresence(room, roomMember);
+    const isPublic = useIsPublic(room);
+    const isLowPriority = !!room.tags[DefaultTagID.LowPriority];
+
+    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 { badgeDecoration, presence };
+}
+
+/**
+ * Hook listening to the room join rules.
+ * Return true if the room is public.
+ * @param room
+ */
+function useIsPublic(room: Room): boolean {
+    const [isPublic, setIsPublic] = useState(isRoomPublic(room));
+    // We don't use `useTypedEventEmitterState` because we don't want to update `isPublic` value at every `RoomEvent.Timeline` event.
+    useTypedEventEmitter(room, RoomEvent.Timeline, (ev: MatrixEvent, _room: Room) => {
+        if (room.roomId !== _room.roomId) return;
+        if (ev.getType() !== EventType.RoomJoinRules && ev.getType() !== EventType.RoomMember) return;
+
+        setIsPublic(isRoomPublic(_room));
+    });
+
+    // Reset the value when the room changes
+    useEffect(() => {
+        setIsPublic(isRoomPublic(room));
+    }, [room]);
+
+    return isPublic;
+}
+
+/**
+ * Whether the room is public.
+ * @param room
+ */
+function isRoomPublic(room: Room): boolean {
+    return room.getJoinRule() === JoinRule.Public;
+}
diff --git a/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx b/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx
new file mode 100644
index 0000000000..10cbc5b568
--- /dev/null
+++ b/src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx
@@ -0,0 +1,84 @@
+/*
+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 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";
+import { onRoomTopicLinkClick } from "../../views/elements/RoomTopic";
+import { useTopic } from "../../../hooks/room/useTopic";
+
+export interface RoomTopicState {
+    /**
+     * The topic of the room, the value is taken from the room state
+     */
+    topic: Optional<ContentHelpers.TopicState>;
+    /**
+     * Whether the topic is expanded or not
+     */
+    expanded: boolean;
+    /**
+     * Whether the user have the permission to edit the topic
+     */
+    canEditTopic: boolean;
+    /**
+     * The callback when the edit button is clicked
+     */
+    onEditClick: (e: SyntheticEvent) => void;
+    /**
+     * When the expand button is clicked, it changes expanded state
+     */
+    onExpandedClick: (ev: SyntheticEvent) => void;
+    /**
+     * The callback when the topic link is clicked
+     */
+    onTopicLinkClick: React.MouseEventHandler<HTMLElement>;
+}
+
+/**
+ * The view model for the room topic used in the RoomSummaryCard
+ * @param room - the room to get the topic from
+ * @returns the room topic state
+ */
+export function useRoomTopicViewModel(room: Room): RoomTopicState {
+    const [expanded, setExpanded] = useState(true);
+
+    const topic = useTopic(room);
+
+    const canEditTopic = useRoomState(room, (state) =>
+        state.maySendStateEvent(EventType.RoomTopic, room.client.getSafeUserId()),
+    );
+
+    const onEditClick = (e: SyntheticEvent): void => {
+        e.preventDefault();
+        e.stopPropagation();
+        defaultDispatcher.dispatch({ action: "open_room_settings" });
+    };
+
+    const onExpandedClick = (e: SyntheticEvent): void => {
+        e.preventDefault();
+        e.stopPropagation();
+        setExpanded((_expanded) => !_expanded);
+    };
+
+    const onTopicLinkClick = (e: React.MouseEvent): void => {
+        if (e.target instanceof HTMLAnchorElement) {
+            onRoomTopicLinkClick(e);
+            return;
+        }
+    };
+
+    return {
+        topic,
+        expanded,
+        canEditTopic,
+        onEditClick,
+        onExpandedClick,
+        onTopicLinkClick,
+    };
+}
diff --git a/src/components/viewmodels/right_panel/RoomSummaryCardViewModel.tsx b/src/components/viewmodels/right_panel/RoomSummaryCardViewModel.tsx
new file mode 100644
index 0000000000..143f3fca18
--- /dev/null
+++ b/src/components/viewmodels/right_panel/RoomSummaryCardViewModel.tsx
@@ -0,0 +1,278 @@
+/*
+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 { useEffect, useRef, useState } from "react";
+import { EventType, type JoinRule, type Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+
+import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
+import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
+import { useScopedRoomContext } from "../../../contexts/ScopedRoomContext";
+import { type E2EStatus } from "../../../utils/ShieldUtils";
+import { isVideoRoom as calcIsVideoRoom } from "../../../utils/video-rooms";
+import { useRoomState } from "../../../hooks/useRoomState";
+import { useAccountData } from "../../../hooks/useAccountData";
+import { useDispatcher } from "../../../hooks/useDispatcher";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import { Action } from "../../../dispatcher/actions";
+import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
+import { canInviteTo } from "../../../utils/room/canInviteTo";
+import { DefaultTagID } from "../../../stores/room-list/models";
+import { useEventEmitterState } from "../../../hooks/useEventEmitter";
+import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
+import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
+import PosthogTrackers from "../../../PosthogTrackers";
+import { PollHistoryDialog } from "../../views/dialogs/PollHistoryDialog";
+import Modal from "../../../Modal";
+import ExportDialog from "../../views/dialogs/ExportDialog";
+import { ShareDialog } from "../../views/dialogs/ShareDialog";
+import { type RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
+import { ReportRoomDialog } from "../../views/dialogs/ReportRoomDialog";
+import { Key } from "../../../Keyboard";
+import { usePinnedEvents } from "../../../hooks/usePinnedEvents";
+import { tagRoom } from "../../../utils/room/tagRoom";
+import { inviteToRoom } from "../../../utils/room/inviteToRoom";
+
+export interface RoomSummaryCardState {
+    isDirectMessage: boolean;
+    /**
+     * Whether the room is encrypted, used to display the correct badge and icon
+     */
+    isRoomEncrypted: boolean;
+    /**
+     * The e2e status of the room, used to display the correct badge and icon
+     */
+    e2eStatus: E2EStatus | undefined;
+    /**
+     * The join rule of the room, used to display the correct badge and icon
+     */
+    roomJoinRule: JoinRule;
+    /**
+     * if it is a video room, it should not display export chat, polls, files, extensions
+     */
+    isVideoRoom: boolean;
+    /**
+     * display the alias of the room, if it exists
+     */
+    alias: string;
+    /**
+     * value to check if the room is a favorite or not
+     */
+    isFavorite: boolean;
+    /**
+     * value to check if we disable invite button or not
+     */
+    canInviteToState: boolean;
+    /**
+     * Getting the number of pinned messages in the room, next to the pin button
+     */
+    pinCount: number;
+    searchInputRef: React.RefObject<HTMLInputElement | null>;
+    /**
+     * The callback when new value is entered in the search input
+     */
+    onUpdateSearchInput: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+    /**
+     * Callbacks to all the actions button in the right panel
+     */
+    onRoomMembersClick: () => void;
+    onRoomThreadsClick: () => void;
+    onRoomFilesClick: () => void;
+    onRoomExtensionsClick: () => void;
+    onRoomPinsClick: () => void;
+    onRoomSettingsClick: (ev: Event) => void;
+    onLeaveRoomClick: () => void;
+    onShareRoomClick: () => void;
+    onRoomExportClick: () => Promise<void>;
+    onRoomPollHistoryClick: () => void;
+    onReportRoomClick: () => Promise<void>;
+    onFavoriteToggleClick: () => void;
+    onInviteToRoomClick: () => void;
+}
+
+/**
+ * Hook to check if the room is a direct message or not
+ * @param room - The room to check
+ * @returns Whether the room is a direct message
+ */
+const useIsDirectMessage = (room: Room): boolean => {
+    const directRoomsList = useAccountData<Record<string, string[]>>(room.client, EventType.Direct);
+    const [isDirectMessage, setDirectMessage] = useState(false);
+
+    useEffect(() => {
+        for (const [, dmRoomList] of Object.entries(directRoomsList)) {
+            if (dmRoomList.includes(room?.roomId ?? "")) {
+                setDirectMessage(true);
+                break;
+            }
+        }
+    }, [room, directRoomsList]);
+
+    return isDirectMessage;
+};
+
+/**
+ * Hook to handle the search input in the right panel
+ * @param onSearchCancel - The callback when the search input is cancelled
+ * @returns The search input ref and the callback when the search input is updated
+ */
+const useSearchInput = (
+    onSearchCancel?: () => void,
+): {
+    searchInputRef: React.RefObject<HTMLInputElement | null>;
+    onUpdateSearchInput: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+} => {
+    const searchInputRef = useRef<HTMLInputElement>(null);
+
+    const onUpdateSearchInput = (e: React.KeyboardEvent<HTMLInputElement>): void => {
+        if (searchInputRef.current && e.key === Key.ESCAPE) {
+            searchInputRef.current.value = "";
+            onSearchCancel?.();
+        }
+    };
+
+    // Focus the search field when the user clicks on the search button component
+    useDispatcher(defaultDispatcher, (payload) => {
+        if (payload.action === Action.FocusMessageSearch) {
+            searchInputRef.current?.focus();
+        }
+    });
+
+    return {
+        searchInputRef,
+        onUpdateSearchInput,
+    };
+};
+
+export function useRoomSummaryCardViewModel(
+    room: Room,
+    permalinkCreator: RoomPermalinkCreator,
+    onSearchCancel?: () => void,
+): RoomSummaryCardState {
+    const cli = useMatrixClientContext();
+
+    const isRoomEncrypted = useIsEncrypted(cli, room) ?? false;
+    const roomContext = useScopedRoomContext("e2eStatus", "timelineRenderingType");
+    const e2eStatus = roomContext.e2eStatus;
+    const isVideoRoom = calcIsVideoRoom(room);
+
+    const roomState = useRoomState(room);
+    // used to check if the room is public or not
+    const roomJoinRule = roomState.getJoinRule();
+    const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || "";
+    const pinCount = usePinnedEvents(room).length;
+    // value to check if the user can invite to the room
+    const canInviteToState = useEventEmitterState(room, RoomStateEvent.Update, () => canInviteTo(room));
+
+    const roomTags = useEventEmitterState(RoomListStore.instance, LISTS_UPDATE_EVENT, () =>
+        RoomListStore.instance.getTagsForRoom(room),
+    );
+    const isFavorite = roomTags.includes(DefaultTagID.Favourite);
+
+    const isDirectMessage = useIsDirectMessage(room);
+
+    const onRoomMembersClick = (): void => {
+        RightPanelStore.instance.pushCard({ phase: RightPanelPhases.MemberList }, true);
+    };
+
+    const onRoomThreadsClick = (): void => {
+        RightPanelStore.instance.pushCard({ phase: RightPanelPhases.ThreadPanel }, true);
+    };
+
+    const onRoomFilesClick = (): void => {
+        RightPanelStore.instance.pushCard({ phase: RightPanelPhases.FilePanel }, true);
+    };
+
+    const onRoomExtensionsClick = (): void => {
+        RightPanelStore.instance.pushCard({ phase: RightPanelPhases.Extensions }, true);
+    };
+
+    const onRoomPinsClick = (): void => {
+        PosthogTrackers.trackInteraction("PinnedMessageRoomInfoButton");
+        RightPanelStore.instance.pushCard({ phase: RightPanelPhases.PinnedMessages }, true);
+    };
+
+    const onRoomSettingsClick = (ev: Event): void => {
+        defaultDispatcher.dispatch({ action: "open_room_settings" });
+        PosthogTrackers.trackInteraction("WebRightPanelRoomInfoSettingsButton", ev);
+    };
+
+    const onShareRoomClick = (): void => {
+        Modal.createDialog(ShareDialog, {
+            target: room,
+        });
+    };
+
+    const onRoomExportClick = async (): Promise<void> => {
+        Modal.createDialog(ExportDialog, {
+            room,
+        });
+    };
+
+    const onRoomPollHistoryClick = (): void => {
+        Modal.createDialog(PollHistoryDialog, {
+            room,
+            matrixClient: cli,
+            permalinkCreator,
+        });
+    };
+
+    const onLeaveRoomClick = (): void => {
+        defaultDispatcher.dispatch({
+            action: "leave_room",
+            room_id: room.roomId,
+        });
+    };
+
+    const onReportRoomClick = async (): Promise<void> => {
+        const [leave] = await Modal.createDialog(ReportRoomDialog, {
+            roomId: room.roomId,
+        }).finished;
+        if (leave) {
+            defaultDispatcher.dispatch({
+                action: "leave_room",
+                room_id: room.roomId,
+            });
+        }
+    };
+
+    const onFavoriteToggleClick = (): void => {
+        tagRoom(room, DefaultTagID.Favourite);
+    };
+
+    const onInviteToRoomClick = (): void => {
+        inviteToRoom(room);
+    };
+
+    // Room Search element ref
+    const { searchInputRef, onUpdateSearchInput } = useSearchInput(onSearchCancel);
+
+    return {
+        isDirectMessage,
+        isRoomEncrypted,
+        roomJoinRule,
+        e2eStatus,
+        isVideoRoom,
+        alias,
+        isFavorite,
+        canInviteToState,
+        searchInputRef,
+        pinCount,
+        onRoomMembersClick,
+        onRoomThreadsClick,
+        onRoomFilesClick,
+        onRoomExtensionsClick,
+        onRoomPinsClick,
+        onRoomSettingsClick,
+        onLeaveRoomClick,
+        onShareRoomClick,
+        onRoomExportClick,
+        onRoomPollHistoryClick,
+        onReportRoomClick,
+        onUpdateSearchInput,
+        onFavoriteToggleClick,
+        onInviteToRoomClick,
+    };
+}
diff --git a/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx b/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
index 8a1fdb1fe7..451a4898b7 100644
--- a/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListHeaderViewModel.tsx
@@ -31,6 +31,7 @@ import {
 import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { createRoom, hasCreateRoomRights } from "./utils";
+import { type SortOption, useSorter } from "./useSorter";
 
 /**
  * Hook to get the active space and its title.
@@ -117,6 +118,14 @@ export interface RoomListHeaderViewState {
      * Open the space settings
      */
     openSpaceSettings: () => void;
+    /**
+     * Change the sort order of the room-list.
+     */
+    sort: (option: SortOption) => void;
+    /**
+     * The currently active sort option.
+     */
+    activeSortOption: SortOption;
 }
 
 /**
@@ -128,8 +137,8 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
     const isSpaceRoom = Boolean(activeSpace);
 
     const canCreateRoom = hasCreateRoomRights(matrixClient, activeSpace);
-    const canCreateVideoRoom = useFeatureEnabled("feature_video_rooms");
-    const displayComposeMenu = canCreateRoom || canCreateVideoRoom;
+    const canCreateVideoRoom = useFeatureEnabled("feature_video_rooms") && canCreateRoom;
+    const displayComposeMenu = canCreateRoom;
     const displaySpaceMenu = isSpaceRoom;
     const canInviteInSpace = Boolean(
         activeSpace?.getJoinRule() === JoinRule.Public || activeSpace?.canInvite(matrixClient.getSafeUserId()),
@@ -138,6 +147,8 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
 
     /* Actions */
 
+    const { activeSortOption, sort } = useSorter();
+
     const createChatRoom = useCallback((e: Event) => {
         defaultDispatcher.fire(Action.CreateChat);
         PosthogTrackers.trackInteraction("WebRoomListHeaderPlusMenuCreateChatItem", e);
@@ -207,5 +218,7 @@ export function useRoomListHeaderViewModel(): RoomListHeaderViewState {
         inviteInSpace,
         openSpacePreferences,
         openSpaceSettings,
+        activeSortOption,
+        sort,
     };
 }
diff --git a/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx b/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
index 6b089495a0..738a05b8c3 100644
--- a/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListItemMenuViewModel.tsx
@@ -11,7 +11,7 @@ import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
 import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import { useEventEmitterState } from "../../../hooks/useEventEmitter";
 import { useUnreadNotifications } from "../../../hooks/useUnreadNotifications";
-import { hasAccessToOptionsMenu } from "./utils";
+import { hasAccessToNotificationMenu, hasAccessToOptionsMenu } from "./utils";
 import DMRoomMap from "../../../utils/DMRoomMap";
 import { DefaultTagID } from "../../../stores/room-list/models";
 import { NotificationLevel } from "../../../stores/notifications/NotificationLevel";
@@ -21,16 +21,26 @@ import dispatcher from "../../../dispatcher/dispatcher";
 import { clearRoomNotification, setMarkedUnreadState } from "../../../utils/notifications";
 import PosthogTrackers from "../../../PosthogTrackers";
 import { tagRoom } from "../../../utils/room/tagRoom";
+import { RoomNotifState } from "../../../RoomNotifs";
+import { useNotificationState } from "../../../hooks/useRoomNotificationState";
 
 export interface RoomListItemMenuViewState {
     /**
      * Whether the more options menu should be shown.
      */
     showMoreOptionsMenu: boolean;
+    /**
+     * Whether the notification menu should be shown.
+     */
+    showNotificationMenu: boolean;
     /**
      * 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.
      */
@@ -47,6 +57,22 @@ export interface RoomListItemMenuViewState {
      * Can mark the room as unread.
      */
     canMarkAsUnread: boolean;
+    /**
+     * Whether the notification is set to all messages.
+     */
+    isNotificationAllMessage: boolean;
+    /**
+     * Whether the notification is set to all messages loud.
+     */
+    isNotificationAllMessageLoud: boolean;
+    /**
+     * Whether the notification is set to mentions and keywords only.
+     */
+    isNotificationMentionOnly: boolean;
+    /**
+     * Whether the notification is muted.
+     */
+    isNotificationMute: boolean;
     /**
      * Mark the room as read.
      * @param evt
@@ -81,6 +107,11 @@ export interface RoomListItemMenuViewState {
      * @param evt
      */
     leaveRoom: (evt: Event) => void;
+    /**
+     * Set the room notification state.
+     * @param state
+     */
+    setRoomNotifState: (state: RoomNotifState) => void;
 }
 
 export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewState {
@@ -88,12 +119,14 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
     const roomTags = useEventEmitterState(room, RoomEvent.Tags, () => room.tags);
     const { level: notificationLevel } = useUnreadNotifications(room);
 
-    const showMoreOptionsMenu = hasAccessToOptionsMenu(room);
-
     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);
+    const showNotificationMenu = hasAccessToNotificationMenu(room, matrixClient.isGuest(), isArchived);
+
     const canMarkAsRead = notificationLevel > NotificationLevel.None;
     const canMarkAsUnread = !canMarkAsRead && !isArchived;
 
@@ -101,6 +134,12 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
         room.canInvite(matrixClient.getUserId()!) && !isDm && shouldShowComponent(UIComponent.InviteUsers);
     const canCopyRoomLink = !isDm;
 
+    const [roomNotifState, setRoomNotifState] = useNotificationState(room);
+    const isNotificationAllMessage = roomNotifState === RoomNotifState.AllMessages;
+    const isNotificationAllMessageLoud = roomNotifState === RoomNotifState.AllMessagesLoud;
+    const isNotificationMentionOnly = roomNotifState === RoomNotifState.MentionsOnly;
+    const isNotificationMute = roomNotifState === RoomNotifState.Mute;
+
     // Actions
 
     const markAsRead = useCallback(
@@ -164,11 +203,17 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
 
     return {
         showMoreOptionsMenu,
+        showNotificationMenu,
         isFavourite,
+        isLowPriority,
         canInvite,
         canCopyRoomLink,
         canMarkAsRead,
         canMarkAsUnread,
+        isNotificationAllMessage,
+        isNotificationAllMessageLoud,
+        isNotificationMentionOnly,
+        isNotificationMute,
         markAsRead,
         markAsUnread,
         toggleFavorite,
@@ -176,5 +221,6 @@ export function useRoomListItemMenuViewModel(room: Room): RoomListItemMenuViewSt
         invite,
         copyRoomLink,
         leaveRoom,
+        setRoomNotifState,
     };
 }
diff --git a/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx b/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
index 1d5d9aba11..e009033875 100644
--- a/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListItemViewModel.tsx
@@ -5,18 +5,31 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { useCallback, useMemo } from "react";
-import { type Room } from "matrix-js-sdk/src/matrix";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
 
 import dispatcher from "../../../dispatcher/dispatcher";
 import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
 import { Action } from "../../../dispatcher/actions";
-import { hasAccessToOptionsMenu } from "./utils";
+import { hasAccessToNotificationMenu, hasAccessToOptionsMenu } from "./utils";
 import { _t } from "../../../languageHandler";
 import { type RoomNotificationState } from "../../../stores/notifications/RoomNotificationState";
 import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+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 { NotificationStateEvents } from "../../../stores/notifications/NotificationState";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import { MessagePreviewStore } from "../../../stores/room-list/MessagePreviewStore";
+import { useMessagePreviewToggle } from "./useMessagePreviewToggle";
 
 export interface RoomListItemViewState {
+    /**
+     * The name of the room.
+     */
+    name: string;
     /**
      * Whether the hover menu should be shown.
      */
@@ -33,6 +46,32 @@ export interface RoomListItemViewState {
      * The notification state of the room.
      */
     notificationState: RoomNotificationState;
+    /**
+     * Whether the room should be bolded.
+     */
+    isBold: boolean;
+    /**
+     * Whether the room is a video room
+     */
+    isVideoRoom: boolean;
+    /**
+     * The connection state of the call.
+     * `null` if there is no call in the room.
+     */
+    callConnectionState: ConnectionState | null;
+    /**
+     * Whether there are participants in the call.
+     */
+    hasParticipantInCall: boolean;
+    /**
+     * Pre-rendered and translated preview for the latest message in the room, or undefined
+     * if no preview should be shown.
+     */
+    messagePreview: string | undefined;
+    /**
+     * Whether the notification decoration should be shown.
+     */
+    showNotificationDecoration: boolean;
 }
 
 /**
@@ -40,10 +79,50 @@ export interface RoomListItemViewState {
  * @see {@link RoomListItemViewState} for more information about what this view model returns.
  */
 export function useRoomListItemViewModel(room: Room): RoomListItemViewState {
-    // incoming: Check notification menu rights
-    const showHoverMenu = hasAccessToOptionsMenu(room);
+    const matrixClient = useMatrixClientContext();
+    const roomTags = useEventEmitterState(room, RoomEvent.Tags, () => room.tags);
+    const isArchived = Boolean(roomTags[DefaultTagID.Archived]);
+    const name = useEventEmitterState(room, RoomEvent.Name, () => room.name);
+
     const notificationState = useMemo(() => RoomNotificationStateStore.instance.getRoomState(room), [room]);
-    const a11yLabel = getA11yLabel(room, notificationState);
+
+    const [a11yLabel, setA11yLabel] = useState(getA11yLabel(name, notificationState));
+    const [{ isBold, invited, hasVisibleNotification }, setNotificationValues] = useState(
+        getNotificationValues(notificationState),
+    );
+    useEffect(() => {
+        setA11yLabel(getA11yLabel(name, notificationState));
+    }, [name, notificationState]);
+
+    // Listen to changes in the notification state and update the values
+    useTypedEventEmitter(notificationState, NotificationStateEvents.Update, () => {
+        setA11yLabel(getA11yLabel(name, notificationState));
+        setNotificationValues(getNotificationValues(notificationState));
+    });
+
+    // If the notification reference change due to room change, update the values
+    useEffect(() => {
+        setNotificationValues(getNotificationValues(notificationState));
+    }, [notificationState]);
+
+    // We don't want to show the hover menu if
+    // - there is an invitation for this room
+    // - the user doesn't have access to both notification and more options menus
+    const showHoverMenu =
+        !invited &&
+        (hasAccessToOptionsMenu(room) || hasAccessToNotificationMenu(room, matrixClient.isGuest(), isArchived));
+
+    const messagePreview = useRoomMessagePreview(room);
+
+    // Video room
+    const isVideoRoom = room.isElementVideoRoom() || room.isCallRoom();
+    // EC video call or video room
+    const call = useCall(room.roomId);
+    const connectionState = useConnectionState(call);
+    const hasParticipantInCall = useParticipantCount(call) > 0;
+    const callConnectionState = call ? connectionState : null;
+
+    const showNotificationDecoration = hasVisibleNotification || hasParticipantInCall;
 
     // Actions
 
@@ -56,38 +135,102 @@ export function useRoomListItemViewModel(room: Room): RoomListItemViewState {
     }, [room]);
 
     return {
+        name,
         notificationState,
         showHoverMenu,
         openRoom,
         a11yLabel,
+        isBold,
+        isVideoRoom,
+        callConnectionState,
+        hasParticipantInCall,
+        messagePreview,
+        showNotificationDecoration,
+    };
+}
+
+/**
+ * Calculate the values from the notification state
+ * @param notificationState
+ */
+function getNotificationValues(notificationState: RoomNotificationState): {
+    computeA11yLabel: (name: string) => string;
+    isBold: boolean;
+    invited: boolean;
+    hasVisibleNotification: boolean;
+} {
+    const invited = notificationState.invited;
+    const computeA11yLabel = (name: string): string => getA11yLabel(name, notificationState);
+    const isBold = notificationState.hasAnyNotificationOrActivity;
+
+    const hasVisibleNotification = notificationState.hasAnyNotificationOrActivity || notificationState.muted;
+
+    return {
+        computeA11yLabel,
+        isBold,
+        invited,
+        hasVisibleNotification,
     };
 }
 
 /**
  * Get the a11y label for the room list item
- * @param room
+ * @param roomName
  * @param notificationState
  */
-function getA11yLabel(room: Room, notificationState: RoomNotificationState): string {
-    if (notificationState.isUnsetMessage) {
+function getA11yLabel(roomName: string, notificationState: RoomNotificationState): string {
+    if (notificationState.isUnsentMessage) {
         return _t("a11y|room_messsage_not_sent", {
-            roomName: room.name,
+            roomName,
         });
     } else if (notificationState.invited) {
         return _t("a11y|room_n_unread_invite", {
-            roomName: room.name,
+            roomName,
         });
     } else if (notificationState.isMention) {
         return _t("a11y|room_n_unread_messages_mentions", {
-            roomName: room.name,
+            roomName,
             count: notificationState.count,
         });
     } else if (notificationState.hasUnreadCount) {
         return _t("a11y|room_n_unread_messages", {
-            roomName: room.name,
+            roomName,
             count: notificationState.count,
         });
     } else {
-        return _t("room_list|room|open_room", { roomName: room.name });
+        return _t("room_list|room|open_room", { roomName });
     }
 }
+
+function useRoomMessagePreview(room: Room): string | undefined {
+    const { shouldShowMessagePreview } = useMessagePreviewToggle();
+    const [previewText, setPreviewText] = useState<string | undefined>(undefined);
+
+    const updatePreview = useCallback(async () => {
+        if (!shouldShowMessagePreview) {
+            setPreviewText(undefined);
+            return;
+        }
+
+        const roomIsDM = Boolean(DMRoomMap.shared().getUserIdForRoomId(room.roomId));
+        // For the tag, we only care about whether the room is a DM or not as we don't show
+        // display names in previewsd for DMs, so anything else we just say is 'untagged'
+        // (even though it could actually be have other tags: we don't care about them).
+        const messagePreview = await MessagePreviewStore.instance.getPreviewForRoom(
+            room,
+            roomIsDM ? DefaultTagID.DM : DefaultTagID.Untagged,
+        );
+        setPreviewText(messagePreview?.text);
+    }, [room, shouldShowMessagePreview]);
+
+    // MessagePreviewStore and the other AsyncStores need to be converted to TypedEventEmitter
+    useEventEmitter(MessagePreviewStore.instance, MessagePreviewStore.getPreviewChangedEventName(room), () => {
+        updatePreview();
+    });
+
+    useEffect(() => {
+        updatePreview();
+    }, [updatePreview]);
+
+    return previewText;
+}
diff --git a/src/components/viewmodels/roomlist/RoomListViewModel.tsx b/src/components/viewmodels/roomlist/RoomListViewModel.tsx
index 217eaefbd9..e4e5093782 100644
--- a/src/components/viewmodels/roomlist/RoomListViewModel.tsx
+++ b/src/components/viewmodels/roomlist/RoomListViewModel.tsx
@@ -8,9 +8,7 @@ Please see LICENSE files in the repository root for full details.
 import { useCallback } from "react";
 
 import type { Room } from "matrix-js-sdk/src/matrix";
-import { type PrimaryFilter, type SecondaryFilters, useFilteredRooms } from "./useFilteredRooms";
-import { type SortOption, useSorter } from "./useSorter";
-import { useMessagePreviewToggle } from "./useMessagePreviewToggle";
+import { type PrimaryFilter, useFilteredRooms } from "./useFilteredRooms";
 import { createRoom as createRoomFunc, hasCreateRoomRights } from "./utils";
 import { useEventEmitterState } from "../../../hooks/useEventEmitter";
 import { UPDATE_SELECTED_SPACE } from "../../../stores/spaces";
@@ -19,8 +17,14 @@ import dispatcher from "../../../dispatcher/dispatcher";
 import { Action } from "../../../dispatcher/actions";
 import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import { useStickyRoomList } from "./useStickyRoomList";
+import { useRoomListNavigation } from "./useRoomListNavigation";
 
 export interface RoomListViewState {
+    /**
+     * Whether the list of rooms is being loaded.
+     */
+    isLoadingRooms: boolean;
+
     /**
      * A list of rooms to be displayed in the left panel.
      */
@@ -55,36 +59,6 @@ export interface RoomListViewState {
      */
     activePrimaryFilter?: PrimaryFilter;
 
-    /**
-     * A function to activate a given secondary filter.
-     */
-    activateSecondaryFilter: (filter: SecondaryFilters) => void;
-
-    /**
-     * The currently active secondary filter.
-     */
-    activeSecondaryFilter: SecondaryFilters;
-
-    /**
-     * Change the sort order of the room-list.
-     */
-    sort: (option: SortOption) => void;
-
-    /**
-     * 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;
-
     /**
      * The index of the active room in the room list.
      */
@@ -97,15 +71,11 @@ export interface RoomListViewState {
  */
 export function useRoomListViewModel(): RoomListViewState {
     const matrixClient = useMatrixClientContext();
-    const {
-        primaryFilters,
-        activePrimaryFilter,
-        rooms: filteredRooms,
-        activateSecondaryFilter,
-        activeSecondaryFilter,
-    } = useFilteredRooms();
+    const { isLoadingRooms, primaryFilters, activePrimaryFilter, rooms: filteredRooms } = useFilteredRooms();
     const { activeIndex, rooms } = useStickyRoomList(filteredRooms);
 
+    useRoomListNavigation(rooms);
+
     const currentSpace = useEventEmitterState<Room | null>(
         SpaceStore.instance,
         UPDATE_SELECTED_SPACE,
@@ -113,25 +83,17 @@ export function useRoomListViewModel(): RoomListViewState {
     );
     const canCreateRoom = hasCreateRoomRights(matrixClient, currentSpace);
 
-    const { activeSortOption, sort } = useSorter();
-    const { shouldShowMessagePreview, toggleMessagePreview } = useMessagePreviewToggle();
-
     const createChatRoom = useCallback(() => dispatcher.fire(Action.CreateChat), []);
     const createRoom = useCallback(() => createRoomFunc(currentSpace), [currentSpace]);
 
     return {
+        isLoadingRooms,
         rooms,
         canCreateRoom,
         createRoom,
         createChatRoom,
         primaryFilters,
         activePrimaryFilter,
-        activateSecondaryFilter,
-        activeSecondaryFilter,
-        activeSortOption,
-        sort,
-        shouldShowMessagePreview,
-        toggleMessagePreview,
         activeIndex,
     };
 }
diff --git a/src/components/viewmodels/roomlist/useFilteredRooms.tsx b/src/components/viewmodels/roomlist/useFilteredRooms.tsx
index 5e1554fcdc..736f75aa57 100644
--- a/src/components/viewmodels/roomlist/useFilteredRooms.tsx
+++ b/src/components/viewmodels/roomlist/useFilteredRooms.tsx
@@ -10,9 +10,10 @@ import { useCallback, 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 from "../../../stores/room-list-v3/RoomListStoreV3";
-import { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
+import RoomListStoreV3, { LISTS_LOADED_EVENT, LISTS_UPDATE_EVENT } 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.
@@ -33,9 +34,8 @@ export interface PrimaryFilter {
 
 interface FilteredRooms {
     primaryFilters: PrimaryFilter[];
+    isLoadingRooms: boolean;
     rooms: Room[];
-    activateSecondaryFilter: (filter: SecondaryFilters) => void;
-    activeSecondaryFilter: SecondaryFilters;
     /**
      * The currently active primary filter.
      * If no primary filter is active, this will be undefined.
@@ -45,53 +45,14 @@ interface FilteredRooms {
 
 const filterKeyToNameMap: Map<FilterKey, TranslationKey> = new Map([
     [FilterKey.UnreadFilter, _td("room_list|filters|unread")],
-    [FilterKey.FavouriteFilter, _td("room_list|filters|favourite")],
     [FilterKey.PeopleFilter, _td("room_list|filters|people")],
     [FilterKey.RoomsFilter, _td("room_list|filters|rooms")],
+    [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")],
 ]);
 
-/**
- * These are the secondary filters which are not prominently shown
- * in the UI.
- */
-export const enum SecondaryFilters {
-    AllActivity,
-    MentionsOnly,
-    InvitesOnly,
-    LowPriority,
-}
-
-/**
- * A map from {@link SecondaryFilters} which the UI understands to
- * {@link FilterKey} which the store understands.
- */
-const secondaryFiltersToFilterKeyMap = new Map([
-    [SecondaryFilters.AllActivity, undefined],
-    [SecondaryFilters.MentionsOnly, FilterKey.MentionsFilter],
-    [SecondaryFilters.InvitesOnly, FilterKey.InvitesFilter],
-    [SecondaryFilters.LowPriority, FilterKey.LowPriorityFilter],
-]);
-
-/**
- * Use this function to determine if a given primary filter is compatible with
- * a given secondary filter. Practically, this determines whether it makes sense
- * to expose two filters together in the UI - for eg, it does not make sense to show the
- * favourite primary filter if the active secondary filter is low priority.
- * @param primary Primary filter key
- * @param secondary Secondary filter key
- * @returns true if compatible, false otherwise
- */
-function isPrimaryFilterCompatible(primary: FilterKey, secondary: FilterKey): boolean {
-    if (secondary === FilterKey.MentionsFilter) {
-        if (primary === FilterKey.UnreadFilter) return false;
-    } else if (secondary === FilterKey.InvitesFilter) {
-        if (primary === FilterKey.UnreadFilter || primary === FilterKey.FavouriteFilter) return false;
-    } else if (secondary === FilterKey.LowPriorityFilter) {
-        if (primary === FilterKey.FavouriteFilter) return false;
-    }
-    return true;
-}
-
 /**
  * Track available filters and provide a filtered list of rooms.
  */
@@ -101,29 +62,23 @@ export function useFilteredRooms(): FilteredRooms {
      * rendered above the room list.
      */
     const [primaryFilter, setPrimaryFilter] = useState<FilterKey | undefined>();
-    /**
-     * Secondary filters are also filters but they are hidden
-     * away in a popup menu.
-     */
-    const [activeSecondaryFilter, setActiveSecondaryFilter] = useState<SecondaryFilters>(SecondaryFilters.AllActivity);
-
-    const secondaryFilter = useMemo(
-        () => secondaryFiltersToFilterKeyMap.get(activeSecondaryFilter),
-        [activeSecondaryFilter],
-    );
 
     const [rooms, setRooms] = 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);
     }, []);
 
+    // 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[] => {
-        return filterUndefined([primaryFilter, secondaryFilter]);
+        return filterUndefined([primaryFilter]);
     };
 
     useEventEmitter(RoomListStoreV3.instance, LISTS_UPDATE_EVENT, () => {
@@ -131,29 +86,9 @@ export function useFilteredRooms(): FilteredRooms {
         updateRoomsFromStore(filters);
     });
 
-    /**
-     * Secondary filters are activated using this function.
-     * This is different to how primary filters work because the secondary
-     * filters are static i.e they are always available and don't need to be
-     * hidden.
-     */
-    const activateSecondaryFilter = useCallback(
-        (filter: SecondaryFilters): void => {
-            // If the filter is already active, just return.
-            if (filter === activeSecondaryFilter) return;
-
-            // SecondaryFilter is an enum for the UI, let's convert it to something
-            // that the store will understand.
-            const secondary = secondaryFiltersToFilterKeyMap.get(filter);
-            setActiveSecondaryFilter(filter);
-
-            // Reset any active primary filters.
-            setPrimaryFilter(undefined);
-
-            updateRoomsFromStore(filterUndefined([secondary]));
-        },
-        [activeSecondaryFilter, updateRoomsFromStore],
-    );
+    useEventEmitter(RoomListStoreV3.instance, LISTS_LOADED_EVENT, () => {
+        setIsLoadingRooms(false);
+    });
 
     /**
      * This tells the view which primary filters are available, how to toggle them
@@ -165,7 +100,7 @@ export function useFilteredRooms(): FilteredRooms {
                 toggle: () => {
                     setPrimaryFilter((currentFilter) => {
                         const filter = currentFilter === key ? undefined : key;
-                        updateRoomsFromStore(filterUndefined([filter, secondaryFilter]));
+                        updateRoomsFromStore(filterUndefined([filter]));
                         return filter;
                     });
                 },
@@ -176,15 +111,17 @@ export function useFilteredRooms(): FilteredRooms {
         };
         const filters: PrimaryFilter[] = [];
         for (const [key, name] of filterKeyToNameMap.entries()) {
-            if (secondaryFilter && !isPrimaryFilterCompatible(key, secondaryFilter)) {
-                continue;
-            }
             filters.push(createPrimaryFilter(key, _t(name)));
         }
         return filters;
-    }, [primaryFilter, updateRoomsFromStore, secondaryFilter]);
+    }, [primaryFilter, updateRoomsFromStore]);
 
     const activePrimaryFilter = useMemo(() => primaryFilters.find((filter) => filter.active), [primaryFilters]);
 
-    return { primaryFilters, activePrimaryFilter, rooms, activateSecondaryFilter, activeSecondaryFilter };
+    return {
+        isLoadingRooms,
+        primaryFilters,
+        activePrimaryFilter,
+        rooms,
+    };
 }
diff --git a/src/components/viewmodels/roomlist/useMessagePreviewToggle.tsx b/src/components/viewmodels/roomlist/useMessagePreviewToggle.tsx
index 27ccd40106..efb58b3e04 100644
--- a/src/components/viewmodels/roomlist/useMessagePreviewToggle.tsx
+++ b/src/components/viewmodels/roomlist/useMessagePreviewToggle.tsx
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: 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, useState } from "react";
+import { useCallback } from "react";
 
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
+import { useSettingValue } from "../../../hooks/useSettings";
 
 interface MessagePreviewToggleState {
     shouldShowMessagePreview: boolean;
@@ -20,17 +21,12 @@ interface MessagePreviewToggleState {
  * - Provides a function to toggle message previews.
  */
 export function useMessagePreviewToggle(): MessagePreviewToggleState {
-    const [shouldShowMessagePreview, setShouldShowMessagePreview] = useState(() =>
-        SettingsStore.getValue("RoomList.showMessagePreview"),
-    );
+    const shouldShowMessagePreview = useSettingValue("RoomList.showMessagePreview");
 
     const toggleMessagePreview = useCallback((): void => {
-        setShouldShowMessagePreview((current) => {
-            const toggled = !current;
-            SettingsStore.setValue("RoomList.showMessagePreview", null, SettingLevel.DEVICE, toggled);
-            return toggled;
-        });
-    }, []);
+        const toggled = !shouldShowMessagePreview;
+        SettingsStore.setValue("RoomList.showMessagePreview", null, SettingLevel.DEVICE, toggled);
+    }, [shouldShowMessagePreview]);
 
     return { toggleMessagePreview, shouldShowMessagePreview };
 }
diff --git a/src/components/viewmodels/roomlist/useRoomListNavigation.ts b/src/components/viewmodels/roomlist/useRoomListNavigation.ts
new file mode 100644
index 0000000000..5ef979e79c
--- /dev/null
+++ b/src/components/viewmodels/roomlist/useRoomListNavigation.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 dispatcher from "../../../dispatcher/dispatcher";
+import { useDispatcher } from "../../../hooks/useDispatcher";
+import { Action } from "../../../dispatcher/actions";
+import { type ViewRoomDeltaPayload } from "../../../dispatcher/payloads/ViewRoomDeltaPayload";
+import type { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
+import { SdkContextClass } from "../../../contexts/SDKContext";
+import { RoomNotificationStateStore } from "../../../stores/notifications/RoomNotificationStateStore";
+
+/**
+ * Hook to navigate the room list using keyboard shortcuts.
+ * It listens to the ViewRoomDelta action and updates the room list accordingly.
+ * @param rooms
+ */
+export function useRoomListNavigation(rooms: Room[]): void {
+    useDispatcher(dispatcher, (payload) => {
+        if (payload.action !== Action.ViewRoomDelta) return;
+        const roomId = SdkContextClass.instance.roomViewStore.getRoomId();
+        if (!roomId) return;
+
+        const { delta, unread } = payload as ViewRoomDeltaPayload;
+        const filteredRooms = unread
+            ? // Filter the rooms to only include unread ones and the active room
+              rooms.filter((room) => {
+                  const state = RoomNotificationStateStore.instance.getRoomState(room);
+                  return room.roomId === roomId || state.isUnread;
+              })
+            : rooms;
+
+        const currentIndex = filteredRooms.findIndex((room) => room.roomId === roomId);
+        if (currentIndex === -1) return;
+
+        // Get the next/previous new room according to the delta
+        // Use slice to loop on the list
+        // If delta is -1 at the start of the list, it will go to the end
+        // If delta is 1 at the end of the list, it will go to the start
+        const [newRoom] = filteredRooms.slice((currentIndex + delta) % filteredRooms.length);
+        if (!newRoom) return;
+
+        dispatcher.dispatch<ViewRoomPayload>({
+            action: Action.ViewRoom,
+            room_id: newRoom.roomId,
+            show_room_tile: true, // to make sure the room gets scrolled into view
+            metricsTrigger: "WebKeyboardShortcut",
+            metricsViaKeyboard: true,
+        });
+    });
+}
diff --git a/src/components/viewmodels/roomlist/useStickyRoomList.tsx b/src/components/viewmodels/roomlist/useStickyRoomList.tsx
index e8234d14ae..06feb58581 100644
--- a/src/components/viewmodels/roomlist/useStickyRoomList.tsx
+++ b/src/components/viewmodels/roomlist/useStickyRoomList.tsx
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 import { SdkContextClass } from "../../../contexts/SDKContext";
 import { useDispatcher } from "../../../hooks/useDispatcher";
@@ -13,6 +13,7 @@ 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";
 
 function getIndexByRoomId(rooms: Room[], roomId: Optional<string>): number | undefined {
     const index = rooms.findIndex((room) => room.roomId === roomId);
@@ -90,8 +91,10 @@ export function useStickyRoomList(rooms: Room[]): StickyRoomListResult {
         roomsWithStickyRoom: rooms,
     });
 
+    const currentSpaceRef = useRef(SpaceStore.instance.activeSpace);
+
     const updateRoomsAndIndex = useCallback(
-        (newRoomId?: string, isRoomChange: boolean = false) => {
+        (newRoomId: string | null, isRoomChange: boolean = false) => {
             setListState((current) => {
                 const activeRoomId = newRoomId ?? SdkContextClass.instance.roomViewStore.getRoomId();
                 const newActiveIndex = getIndexByRoomId(rooms, activeRoomId);
@@ -110,7 +113,21 @@ export function useStickyRoomList(rooms: Room[]): StickyRoomListResult {
 
     // Re-calculate the index when the list of rooms has changed.
     useEffect(() => {
-        updateRoomsAndIndex();
+        let newRoomId: string | null = null;
+        let isRoomChange = false;
+        const newSpace = SpaceStore.instance.activeSpace;
+        if (currentSpaceRef.current !== newSpace) {
+            /*
+            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);
+            isRoomChange = true;
+            currentSpaceRef.current = newSpace;
+        }
+        updateRoomsAndIndex(newRoomId, isRoomChange);
     }, [rooms, updateRoomsAndIndex]);
 
     return { activeIndex: listState.index, rooms: listState.roomsWithStickyRoom };
diff --git a/src/components/viewmodels/roomlist/utils.ts b/src/components/viewmodels/roomlist/utils.ts
index 6220c3b961..dfa20e0d1c 100644
--- a/src/components/viewmodels/roomlist/utils.ts
+++ b/src/components/viewmodels/roomlist/utils.ts
@@ -27,6 +27,16 @@ export function hasAccessToOptionsMenu(room: Room): boolean {
     );
 }
 
+/**
+ * Check if the user has access to the notification menu.
+ * @param room
+ * @param isGuest
+ * @param isArchived
+ */
+export function hasAccessToNotificationMenu(room: Room, isGuest: boolean, isArchived: boolean): boolean {
+    return !isGuest && !isArchived && hasAccessToOptionsMenu(room);
+}
+
 /**
  * Create a room
  * @param space - The space to create the room in
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
index 321cb15ec3..a9bf8b7597 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -11,8 +11,9 @@ import { type InternationalisedPolicy, type Terms, type MatrixClient } from "mat
 import { AuthType, type AuthDict, type IInputs, type IStageStatus } from "matrix-js-sdk/src/interactive-auth";
 import { logger } from "matrix-js-sdk/src/logger";
 import React, { type JSX, type ChangeEvent, createRef, type FormEvent, Fragment } from "react";
-import { Button, Text } from "@vector-im/compound-web";
+import { Button } from "@vector-im/compound-web";
 import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
+import UserProfileSolidIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-profile-solid";
 
 import EmailPromptIcon from "../../../../res/img/element-icons/email-prompt.svg";
 import { _t } from "../../../languageHandler";
@@ -21,8 +22,9 @@ import AccessibleButton, { type AccessibleButtonKind, type ButtonEvent } from ".
 import Field from "../elements/Field";
 import Spinner from "../elements/Spinner";
 import CaptchaForm from "./CaptchaForm";
-import { Flex } from "../../utils/Flex";
 import { pickBestPolicyLanguage } from "../../../Terms.ts";
+import { EncryptionCardButtons } from "../settings/encryption/EncryptionCardButtons.tsx";
+import { EncryptionCard } from "../settings/encryption/EncryptionCard.tsx";
 
 /* This file contains a collection of components which are used by the
  * InteractiveAuth to prompt the user to enter the information needed
@@ -971,9 +973,14 @@ export class MasUnlockCrossSigningAuthEntry extends FallbackAuthEntry<{
 
     public render(): React.ReactNode {
         return (
-            <div>
-                <Text>{_t("auth|uia|mas_cross_signing_reset_description")}</Text>
-                <Flex gap="var(--cpd-space-4x)">
+            <EncryptionCard
+                Icon={UserProfileSolidIcon}
+                title={_t("auth|uia|mas_cross_signing_reset_title")}
+                description={_t("auth|uia|mas_cross_signing_reset_description", {
+                    serverName: this.props.matrixClient.getDomain(),
+                })}
+            >
+                <EncryptionCardButtons>
                     <Button
                         Icon={PopOutIcon}
                         onClick={this.onGoToAccountClick}
@@ -983,11 +990,11 @@ export class MasUnlockCrossSigningAuthEntry extends FallbackAuthEntry<{
                     >
                         {_t("auth|uia|mas_cross_signing_reset_cta")}
                     </Button>
-                    <Button onClick={this.onRetryClick} kind="secondary" className="mx_Dialog_nonDialogButton">
+                    <Button onClick={this.onRetryClick} kind="tertiary" className="mx_Dialog_nonDialogButton">
                         {_t("action|retry")}
                     </Button>
-                </Flex>
-            </div>
+                </EncryptionCardButtons>
+            </EncryptionCard>
         );
     }
 }
diff --git a/src/components/views/auth/RegistrationForm.tsx b/src/components/views/auth/RegistrationForm.tsx
index 783c15ed3f..88e9aa0615 100644
--- a/src/components/views/auth/RegistrationForm.tsx
+++ b/src/components/views/auth/RegistrationForm.tsx
@@ -127,19 +127,11 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState
 
         if (this.state.email === "") {
             if (this.showEmail()) {
-                Modal.createDialog(RegistrationEmailPromptDialog, {
-                    onFinished: async (confirmed: boolean, email?: string): Promise<void> => {
-                        if (confirmed && email !== undefined) {
-                            this.setState(
-                                {
-                                    email,
-                                },
-                                () => {
-                                    this.doSubmit(ev);
-                                },
-                            );
-                        }
-                    },
+                const { finished } = Modal.createDialog(RegistrationEmailPromptDialog);
+                finished.then(async ([confirmed, email]) => {
+                    if (confirmed && email !== undefined) {
+                        this.setState({ email }, () => this.doSubmit(ev));
+                    }
                 });
             } else {
                 // user can't set an e-mail so don't prompt them to
diff --git a/src/components/views/avatars/BaseAvatar.tsx b/src/components/views/avatars/BaseAvatar.tsx
index 8aabf60149..0837bf1dc8 100644
--- a/src/components/views/avatars/BaseAvatar.tsx
+++ b/src/components/views/avatars/BaseAvatar.tsx
@@ -9,7 +9,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 AriaRole, forwardRef, useCallback, useContext, useEffect, useState } from "react";
+import React, { type AriaRole, type JSX, type Ref, useCallback, useContext, useEffect, useState } from "react";
 import classNames from "classnames";
 import { ClientEvent, type SyncState } from "matrix-js-sdk/src/matrix";
 import { Avatar } from "@vector-im/compound-web";
@@ -34,6 +34,7 @@ interface IProps {
     tabIndex?: number;
     altText?: string;
     role?: AriaRole;
+    ref?: Ref<HTMLElement>;
 }
 
 const calculateUrls = (url?: string | null, urls?: string[], lowBandwidth = false): string[] => {
@@ -87,7 +88,7 @@ const useImageUrl = ({ url, urls }: { url?: string | null; urls?: string[] }): [
     return [imageUrl, onError];
 };
 
-const BaseAvatar = forwardRef<HTMLElement, IProps>((props, ref) => {
+const BaseAvatar = (props: IProps): JSX.Element => {
     const {
         name,
         idName,
@@ -99,6 +100,7 @@ const BaseAvatar = forwardRef<HTMLElement, IProps>((props, ref) => {
         className,
         type = "round",
         altText = _t("common|avatar"),
+        ref,
         ...otherProps
     } = props;
 
@@ -134,7 +136,7 @@ const BaseAvatar = forwardRef<HTMLElement, IProps>((props, ref) => {
             data-testid="avatar-img"
         />
     );
-});
+};
 
 export default BaseAvatar;
 export type BaseAvatarType = React.FC<IProps>;
diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx
index c4b17aea53..321c0501dc 100644
--- a/src/components/views/avatars/DecoratedRoomAvatar.tsx
+++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx
@@ -79,6 +79,9 @@ function tooltipText(variant: Icon): string | undefined {
     }
 }
 
+/**
+ * @deprecated Use {@link RoomAvatarView} instead.
+ */
 export default class DecoratedRoomAvatar extends React.PureComponent<IProps, IState> {
     private _dmUser: User | null = null;
     private isUnmounted = false;
diff --git a/src/components/views/avatars/MemberAvatar.tsx b/src/components/views/avatars/MemberAvatar.tsx
index aed1e61180..a62594f038 100644
--- a/src/components/views/avatars/MemberAvatar.tsx
+++ b/src/components/views/avatars/MemberAvatar.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, forwardRef, type ReactNode, type Ref, useContext } from "react";
+import React, { type JSX, type ReactNode, type Ref, useContext } from "react";
 import { type RoomMember, type ResizeMethod } from "matrix-js-sdk/src/matrix";
 
 import dis from "../../../dispatcher/dispatcher";
@@ -18,6 +18,7 @@ import { CardContext } from "../right_panel/context";
 import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
 import { useRoomMemberProfile } from "../../../hooks/room/useRoomMemberProfile";
 import { _t } from "../../../languageHandler";
+import MatrixClientContext from "../../../contexts/MatrixClientContext.tsx";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
     member: RoomMember | null;
@@ -32,21 +33,21 @@ interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" |
     forceHistorical?: boolean; // true to deny `useOnlyCurrentProfiles` usage. Default false.
     hideTitle?: boolean;
     children?: ReactNode;
+    ref?: Ref<HTMLElement>;
 }
 
-function MemberAvatar(
-    {
-        size,
-        resizeMethod = "crop",
-        viewUserOnClick,
-        forceHistorical,
-        fallbackUserId,
-        hideTitle,
-        member: propsMember,
-        ...props
-    }: IProps,
-    ref: Ref<HTMLElement>,
-): JSX.Element {
+export default function MemberAvatar({
+    size,
+    resizeMethod = "crop",
+    viewUserOnClick,
+    forceHistorical,
+    fallbackUserId,
+    hideTitle,
+    member: propsMember,
+    ref,
+    ...props
+}: IProps): JSX.Element {
+    const cli = useContext(MatrixClientContext);
     const card = useContext(CardContext);
 
     const member = useRoomMemberProfile({
@@ -60,7 +61,7 @@ function MemberAvatar(
     let imageUrl: string | null | undefined;
     if (member?.name) {
         if (member.getMxcAvatarUrl()) {
-            imageUrl = mediaFromMxc(member.getMxcAvatarUrl() ?? "").getThumbnailOfSourceHttp(
+            imageUrl = mediaFromMxc(member.getMxcAvatarUrl() ?? "", cli).getThumbnailOfSourceHttp(
                 parseInt(size, 10),
                 parseInt(size, 10),
                 resizeMethod,
@@ -99,5 +100,3 @@ function MemberAvatar(
         />
     );
 }
-
-export default forwardRef(MemberAvatar);
diff --git a/src/components/views/avatars/RoomAvatar.tsx b/src/components/views/avatars/RoomAvatar.tsx
index e1e3e9157d..6490378731 100644
--- a/src/components/views/avatars/RoomAvatar.tsx
+++ b/src/components/views/avatars/RoomAvatar.tsx
@@ -6,156 +6,92 @@ 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 ComponentProps } from "react";
-import {
-    type Room,
-    RoomStateEvent,
-    type MatrixEvent,
-    EventType,
-    RoomType,
-    KnownMembership,
-} from "matrix-js-sdk/src/matrix";
+import React, { useCallback, useMemo, type ComponentProps } from "react";
+import { type Room, RoomType, KnownMembership, EventType } from "matrix-js-sdk/src/matrix";
+import { type RoomAvatarEventContent } from "matrix-js-sdk/src/types";
 
 import BaseAvatar from "./BaseAvatar";
 import ImageView from "../elements/ImageView";
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from "../../../Modal";
 import * as Avatar from "../../../Avatar";
-import DMRoomMap from "../../../utils/DMRoomMap";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { type IOOBData } from "../../../stores/ThreepidInviteStore";
-import { LocalRoom } from "../../../models/LocalRoom";
 import { filterBoolean } from "../../../utils/arrays";
-import SettingsStore from "../../../settings/SettingsStore";
+import { useSettingValue } from "../../../hooks/useSettings";
+import { useRoomState } from "../../../hooks/useRoomState";
+import { useRoomIdName } from "../../../hooks/room/useRoomIdName";
+import { MediaPreviewValue } from "../../../@types/media_preview";
 
-interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick"> {
+interface IProps extends Omit<ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url" | "onClick" | "size"> {
     // Room may be left unset here, but if it is,
     // oobData.avatarUrl should be set (else there
     // would be nowhere to get the avatar from)
     room?: Room;
-    oobData: IOOBData & {
+    // Optional here.
+    size?: ComponentProps<typeof BaseAvatar>["size"];
+    oobData?: IOOBData & {
         roomId?: string;
     };
     viewAvatarOnClick?: boolean;
     onClick?(): void;
 }
 
-interface IState {
-    urls: string[];
-}
+const RoomAvatar: React.FC<IProps> = ({ room, viewAvatarOnClick, onClick, oobData, size = "36px", ...otherProps }) => {
+    const roomName = room?.name ?? oobData?.name ?? "?";
+    const avatarEvent = useRoomState(room, (state) => state.getStateEvents(EventType.RoomAvatar, ""));
+    const roomIdName = useRoomIdName(room, oobData);
 
-export function idNameForRoom(room: Room): string {
-    const dmMapUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
-    // If the room is a DM, we use the other user's ID for the color hash
-    // in order to match the room avatar with their avatar
-    if (dmMapUserId) return dmMapUserId;
+    const showAvatarsOnInvites =
+        useSettingValue("mediaPreviewConfig", room?.roomId).invite_avatars === MediaPreviewValue.On;
 
-    if (room instanceof LocalRoom && room.targets.length === 1) {
-        return room.targets[0].userId;
-    }
-
-    return room.roomId;
-}
-
-export default class RoomAvatar extends React.Component<IProps, IState> {
-    public static defaultProps = {
-        size: "36px",
-        oobData: {},
-    };
-
-    public constructor(props: IProps) {
-        super(props);
-
-        this.state = {
-            urls: RoomAvatar.getImageUrls(this.props),
+    const onRoomAvatarClick = useCallback(() => {
+        const avatarUrl = Avatar.avatarUrlForRoom(room ?? null);
+        if (!avatarUrl) return;
+        const params = {
+            src: avatarUrl,
+            name: room?.name,
         };
-    }
 
-    public componentDidMount(): void {
-        MatrixClientPeg.safeGet().on(RoomStateEvent.Events, this.onRoomStateEvents);
-    }
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", undefined, true);
+    }, [room]);
 
-    public componentWillUnmount(): void {
-        MatrixClientPeg.get()?.removeListener(RoomStateEvent.Events, this.onRoomStateEvents);
-    }
-
-    public static getDerivedStateFromProps(nextProps: IProps): IState {
-        return {
-            urls: RoomAvatar.getImageUrls(nextProps),
-        };
-    }
-
-    private onRoomStateEvents = (ev: MatrixEvent): void => {
-        if (ev.getRoomId() !== this.props.room?.roomId || ev.getType() !== EventType.RoomAvatar) return;
-
-        this.setState({
-            urls: RoomAvatar.getImageUrls(this.props),
-        });
-    };
-
-    private static getImageUrls(props: IProps): string[] {
-        const myMembership = props.room?.getMyMembership();
-        if (myMembership === KnownMembership.Invite || !myMembership) {
-            if (SettingsStore.getValue("showAvatarsOnInvites") === false) {
-                // The user has opted out of showing avatars, so return no urls here.
-                return [];
-            }
+    const urls = useMemo(() => {
+        const myMembership = room?.getMyMembership();
+        if (!showAvatarsOnInvites && (myMembership === KnownMembership.Invite || !myMembership)) {
+            // The user has opted out of showing avatars, so return no urls here.
+            return [];
         }
+
+        // parseInt ignores suffixes.
+        const sizeInt = parseInt(size, 10);
         let oobAvatar: string | null = null;
-        if (props.oobData.avatarUrl) {
-            oobAvatar = mediaFromMxc(props.oobData.avatarUrl).getThumbnailOfSourceHttp(
-                parseInt(props.size, 10),
-                parseInt(props.size, 10),
-                "crop",
-            );
+        if (oobData?.avatarUrl) {
+            oobAvatar = mediaFromMxc(oobData?.avatarUrl).getThumbnailOfSourceHttp(sizeInt, sizeInt, "crop");
         }
 
         return filterBoolean([
             oobAvatar, // highest priority
-            RoomAvatar.getRoomAvatarUrl(props),
+            Avatar.avatarUrlForRoom(
+                room ?? null,
+                sizeInt,
+                sizeInt,
+                "crop",
+                avatarEvent?.getContent<RoomAvatarEventContent>().url,
+            ),
         ]);
-    }
+    }, [showAvatarsOnInvites, room, size, avatarEvent, oobData]);
 
-    private static getRoomAvatarUrl(props: IProps): string | null {
-        if (!props.room) return null;
+    return (
+        <BaseAvatar
+            {...otherProps}
+            size={size}
+            type={(room?.getType() ?? oobData?.roomType) === RoomType.Space ? "square" : "round"}
+            name={roomName}
+            idName={roomIdName}
+            urls={urls}
+            onClick={viewAvatarOnClick && urls[0] ? onRoomAvatarClick : onClick}
+        />
+    );
+};
 
-        return Avatar.avatarUrlForRoom(props.room, parseInt(props.size, 10), parseInt(props.size, 10), "crop");
-    }
-
-    private onRoomAvatarClick = (): void => {
-        const avatarUrl = Avatar.avatarUrlForRoom(this.props.room ?? null, undefined, undefined, undefined);
-        if (!avatarUrl) return;
-        const params = {
-            src: avatarUrl,
-            name: this.props.room?.name,
-        };
-
-        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox", undefined, true);
-    };
-
-    private get roomIdName(): string | undefined {
-        const room = this.props.room;
-
-        if (room) {
-            return idNameForRoom(room);
-        } else {
-            return this.props.oobData?.roomId;
-        }
-    }
-
-    public render(): React.ReactNode {
-        const { room, oobData, viewAvatarOnClick, onClick, className, ...otherProps } = this.props;
-        const roomName = room?.name ?? oobData.name ?? "?";
-
-        return (
-            <BaseAvatar
-                {...otherProps}
-                type={(room?.getType() ?? this.props.oobData?.roomType) === RoomType.Space ? "square" : "round"}
-                name={roomName}
-                idName={this.roomIdName}
-                urls={this.state.urls}
-                onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : onClick}
-            />
-        );
-    }
-}
+export default RoomAvatar;
diff --git a/src/components/views/avatars/RoomAvatarView.tsx b/src/components/views/avatars/RoomAvatarView.tsx
new file mode 100644
index 0000000000..5ddf355d6f
--- /dev/null
+++ b/src/components/views/avatars/RoomAvatarView.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 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 RoomAvatar from "./RoomAvatar";
+import { AvatarBadgeDecoration, useRoomAvatarViewModel } from "../../viewmodels/avatars/RoomAvatarViewModel";
+import { _t } from "../../../languageHandler";
+import { Presence } from "./WithPresenceIndicator";
+
+interface RoomAvatarViewProps {
+    /**
+     * The room to display the avatar for.
+     */
+    room: Room;
+}
+
+/**
+ * Component to display the avatar of a room.
+ * Currently only 32px size is supported.
+ */
+export function RoomAvatarView({ room }: RoomAvatarViewProps): JSX.Element {
+    const vm = useRoomAvatarViewModel(room);
+    // No decoration, we just show the avatar
+    if (!vm.badgeDecoration) return <RoomAvatar size="32px" room={room} />;
+
+    const icon = getAvatarDecoration(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", maskClass)} size="32px" room={room} />
+            {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.
+ */
+function PresenceDecoration({ presence }: PresenceDecorationProps): JSX.Element {
+    switch (presence) {
+        case Presence.Online:
+            return (
+                <OnlineOrUnavailableIcon
+                    width="8px"
+                    height="8px"
+                    className="mx_RoomAvatarView_PresenceDecoration"
+                    color="var(--cpd-color-icon-accent-primary)"
+                    aria-label={_t("presence|online")}
+                />
+            );
+        case Presence.Away:
+            return (
+                <OnlineOrUnavailableIcon
+                    width="8px"
+                    height="8px"
+                    className="mx_RoomAvatarView_PresenceDecoration"
+                    color="var(--cpd-color-icon-quaternary)"
+                    aria-label={_t("presence|away")}
+                />
+            );
+        case Presence.Offline:
+            return (
+                <OfflineIcon
+                    width="8px"
+                    height="8px"
+                    className="mx_RoomAvatarView_PresenceDecoration"
+                    color="var(--cpd-color-icon-tertiary)"
+                    aria-label={_t("presence|offline")}
+                />
+            );
+        case Presence.Busy:
+            return (
+                <BusyIcon
+                    width="8px"
+                    height="8px"
+                    className="mx_RoomAvatarView_PresenceDecoration"
+                    color="var(--cpd-color-icon-tertiary)"
+                    aria-label={_t("presence|busy")}
+                />
+            );
+    }
+}
+
+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={_t("room|room_is_low_priority")}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.VideoRoom) {
+        return (
+            <VideoIcon
+                width="16px"
+                height="16px"
+                className="mx_RoomAvatarView_icon"
+                color="var(--cpd-color-icon-tertiary)"
+                aria-label={_t("room|video_room")}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.PublicRoom) {
+        return (
+            <PublicIcon
+                width="16px"
+                height="16px"
+                className="mx_RoomAvatarView_icon"
+                color="var(--cpd-color-icon-tertiary)"
+                aria-label={_t("room|header|room_is_public")}
+            />
+        );
+    } else if (decoration === AvatarBadgeDecoration.Presence) {
+        return <PresenceDecoration presence={presence!} />;
+    }
+}
diff --git a/src/components/views/avatars/WithPresenceIndicator.tsx b/src/components/views/avatars/WithPresenceIndicator.tsx
index a08250a17c..4c4caecd69 100644
--- a/src/components/views/avatars/WithPresenceIndicator.tsx
+++ b/src/components/views/avatars/WithPresenceIndicator.tsx
@@ -26,7 +26,7 @@ interface Props {
     children: ReactNode;
 }
 
-enum Presence {
+export enum Presence {
     // Note: the names here are used in CSS class names
     Online = "ONLINE",
     Away = "AWAY",
@@ -52,14 +52,14 @@ function getDmMember(room: Room): RoomMember | null {
     return otherUserId ? room.getMember(otherUserId) : null;
 }
 
-export const useDmMember = (room: Room): RoomMember | null => {
-    const [dmMember, setDmMember] = useState<RoomMember | null>(getDmMember(room));
+export const useDmMember = (room?: Room): RoomMember | null => {
+    const [dmMember, setDmMember] = useState<RoomMember | null>(room ? getDmMember(room) : null);
     const updateDmMember = (): void => {
-        setDmMember(getDmMember(room));
+        setDmMember(room ? getDmMember(room) : null);
     };
 
-    useEventEmitter(room.currentState, RoomStateEvent.Members, updateDmMember);
-    useEventEmitter(room.client, ClientEvent.AccountData, updateDmMember);
+    useEventEmitter(room?.currentState, RoomStateEvent.Members, updateDmMember);
+    useEventEmitter(room?.client, ClientEvent.AccountData, updateDmMember);
     useEffect(updateDmMember, [room]);
 
     return dmMember;
@@ -86,7 +86,7 @@ function getPresence(member: RoomMember | null): Presence | null {
     return null;
 }
 
-const usePresence = (room: Room, member: RoomMember | null): Presence | null => {
+export const usePresence = (room: Room, member: RoomMember | null): Presence | null => {
     const [presence, setPresence] = useState<Presence | null>(getPresence(member));
     const updatePresence = (): void => {
         setPresence(getPresence(member));
diff --git a/src/components/views/context_menus/DeveloperToolsOption.tsx b/src/components/views/context_menus/DeveloperToolsOption.tsx
index fc77a2e284..53a5d7283d 100644
--- a/src/components/views/context_menus/DeveloperToolsOption.tsx
+++ b/src/components/views/context_menus/DeveloperToolsOption.tsx
@@ -25,7 +25,6 @@ export const DeveloperToolsOption: React.FC<Props> = ({ onFinished, roomId }) =>
                 Modal.createDialog(
                     DevtoolsDialog,
                     {
-                        onFinished: () => {},
                         roomId: roomId,
                     },
                     "mx_DevtoolsDialog_wrapper",
diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx
index 627e0814e2..5b03d54e17 100644
--- a/src/components/views/context_menus/WidgetContextMenu.tsx
+++ b/src/components/views/context_menus/WidgetContextMenu.tsx
@@ -187,14 +187,15 @@ export const WidgetContextMenu: React.FC<IProps> = ({
                 onDeleteClick();
             } else if (roomId) {
                 // Show delete confirmation dialog
-                Modal.createDialog(QuestionDialog, {
+                const { finished } = Modal.createDialog(QuestionDialog, {
                     title: _t("widget|context_menu|delete"),
                     description: _t("widget|context_menu|delete_warning"),
                     button: _t("widget|context_menu|delete"),
-                    onFinished: (confirmed) => {
-                        if (!confirmed) return;
-                        WidgetUtils.setRoomWidget(cli, roomId, app.id);
-                    },
+                });
+
+                finished.then(([confirmed]) => {
+                    if (!confirmed) return;
+                    WidgetUtils.setRoomWidget(cli, roomId, app.id);
                 });
             }
 
diff --git a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
index 90681556e8..d80f03b7d4 100644
--- a/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
+++ b/src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx
@@ -11,7 +11,7 @@ import React from "react";
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import DialogButtons from "../elements/DialogButtons";
-import Modal, { type ComponentProps } from "../../../Modal";
+import Modal, { type ComponentProps, type IHandle } from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
 import { getPolicyUrl } from "../../../toasts/AnalyticsToast";
 import ExternalLink from "../elements/ExternalLink";
@@ -91,10 +91,10 @@ export const AnalyticsLearnMoreDialog: React.FC<IProps> = ({
 
 export const showDialog = (
     props: Omit<ComponentProps<typeof AnalyticsLearnMoreDialog>, "cookiePolicyUrl" | "analyticsOwner">,
-): void => {
+): IHandle<typeof AnalyticsLearnMoreDialog> => {
     const privacyPolicyUrl = getPolicyUrl();
     const analyticsOwner = SdkConfig.get("analytics_owner") ?? SdkConfig.get("brand");
-    Modal.createDialog(
+    return Modal.createDialog(
         AnalyticsLearnMoreDialog,
         {
             privacyPolicyUrl,
diff --git a/src/components/views/dialogs/BaseDialog.tsx b/src/components/views/dialogs/BaseDialog.tsx
index bf23919771..56f6d0c528 100644
--- a/src/components/views/dialogs/BaseDialog.tsx
+++ b/src/components/views/dialogs/BaseDialog.tsx
@@ -23,13 +23,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 +78,6 @@ interface IProps {
 
     // optional Posthog ScreenName to supply during the lifetime of this dialog
     "screenName"?: ScreenName;
-    onFinished(): void;
 }
 
 /*
@@ -103,13 +114,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 {
diff --git a/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx b/src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx
new file mode 100644
index 0000000000..49e7cad17b
--- /dev/null
+++ b/src/components/views/dialogs/ConfirmKeyStorageOffDialog.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 from "react";
+import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error";
+import { Button } from "@vector-im/compound-web";
+import { PopOutIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
+
+import { _t } from "../../../languageHandler";
+import defaultDispatcher from "../../../dispatcher/dispatcher";
+import { EncryptionCard } from "../settings/encryption/EncryptionCard";
+import { EncryptionCardButtons } from "../settings/encryption/EncryptionCardButtons";
+import { type OpenToTabPayload } from "../../../dispatcher/payloads/OpenToTabPayload";
+import { Action } from "../../../dispatcher/actions";
+import { UserTab } from "./UserTab";
+
+interface Props {
+    onFinished: (dismissed: boolean) => void;
+}
+
+/**
+ * Ask the user whether they really want to dismiss the toast about key storage.
+ *
+ * Launched from the {@link SetupEncryptionToast} in mode `TURN_ON_KEY_STORAGE`,
+ * when the user clicks "Dismiss". The caller handles any action via the
+ * `onFinished` prop which takes a boolean that is true if the user clicked
+ * "Yes, dismiss".
+ */
+export default class ConfirmKeyStorageOffDialog extends React.Component<Props> {
+    public constructor(props: Props) {
+        super(props);
+    }
+
+    private onGoToSettingsClick = (): void => {
+        // Open Settings at the Encryption tab
+        const payload: OpenToTabPayload = {
+            action: Action.ViewUserSettings,
+            initialTabId: UserTab.Encryption,
+        };
+        defaultDispatcher.dispatch(payload);
+        this.props.onFinished(false);
+    };
+
+    private onDismissClick = (): void => {
+        this.props.onFinished(true);
+    };
+
+    public render(): React.ReactNode {
+        return (
+            <EncryptionCard
+                Icon={ErrorIcon}
+                destructive={true}
+                title={_t("settings|encryption|confirm_key_storage_off")}
+            >
+                {_t("settings|encryption|confirm_key_storage_off_description", undefined, {
+                    a: (sub) => (
+                        <>
+                            <br />
+                            <a href="https://element.io/help#encryption5" target="_blank" rel="noreferrer noopener">
+                                {sub} <PopOutIcon />
+                            </a>
+                        </>
+                    ),
+                })}
+                <EncryptionCardButtons>
+                    <Button onClick={this.onGoToSettingsClick} autoFocus kind="primary" className="">
+                        {_t("common|go_to_settings")}
+                    </Button>
+                    <Button onClick={this.onDismissClick} kind="secondary">
+                        {_t("action|yes_dismiss")}
+                    </Button>
+                </EncryptionCardButtons>
+            </EncryptionCard>
+        );
+    }
+}
diff --git a/src/components/views/dialogs/ConfirmRedactDialog.tsx b/src/components/views/dialogs/ConfirmRedactDialog.tsx
index d3fba9b475..17bf75ccad 100644
--- a/src/components/views/dialogs/ConfirmRedactDialog.tsx
+++ b/src/components/views/dialogs/ConfirmRedactDialog.tsx
@@ -58,37 +58,32 @@ export function createRedactEventDialog({
     const roomId = mxEvent.getRoomId();
 
     if (!roomId) throw new Error(`cannot redact event ${mxEvent.getId()} without room ID`);
-    Modal.createDialog(
-        ConfirmRedactDialog,
-        {
-            event: mxEvent,
-            onFinished: async (proceed, reason): Promise<void> => {
-                if (!proceed) return;
+    const { finished } = Modal.createDialog(ConfirmRedactDialog, { event: mxEvent }, "mx_Dialog_confirmredact");
 
-                const cli = MatrixClientPeg.safeGet();
-                const withRelTypes: Pick<IRedactOpts, "with_rel_types"> = {};
+    finished.then(async ([proceed, reason]) => {
+        if (!proceed) return;
 
-                try {
-                    onCloseDialog?.();
-                    await cli.redactEvent(roomId, eventId, undefined, {
-                        ...(reason ? { reason } : {}),
-                        ...withRelTypes,
-                    });
-                } catch (e: any) {
-                    const code = e.errcode || e.statusCode;
-                    // only show the dialog if failing for something other than a network error
-                    // (e.g. no errcode or statusCode) as in that case the redactions end up in the
-                    // detached queue and we show the room status bar to allow retry
-                    if (typeof code !== "undefined") {
-                        // display error message stating you couldn't delete this.
-                        Modal.createDialog(ErrorDialog, {
-                            title: _t("common|error"),
-                            description: _t("redact|error", { code }),
-                        });
-                    }
-                }
-            },
-        },
-        "mx_Dialog_confirmredact",
-    );
+        const cli = MatrixClientPeg.safeGet();
+        const withRelTypes: Pick<IRedactOpts, "with_rel_types"> = {};
+
+        try {
+            onCloseDialog?.();
+            await cli.redactEvent(roomId, eventId, undefined, {
+                ...(reason ? { reason } : {}),
+                ...withRelTypes,
+            });
+        } catch (e: any) {
+            const code = e.errcode || e.statusCode;
+            // only show the dialog if failing for something other than a network error
+            // (e.g. no errcode or statusCode) as in that case the redactions end up in the
+            // detached queue and we show the room status bar to allow retry
+            if (typeof code !== "undefined") {
+                // display error message stating you couldn't delete this.
+                Modal.createDialog(ErrorDialog, {
+                    title: _t("common|error"),
+                    description: _t("redact|error", { code }),
+                });
+            }
+        }
+    });
 }
diff --git a/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx b/src/components/views/dialogs/DeclineAndBlockInviteDialog.tsx
new file mode 100644
index 0000000000..a10dfbe42b
--- /dev/null
+++ b/src/components/views/dialogs/DeclineAndBlockInviteDialog.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 React, { type ChangeEventHandler, useCallback, useState } from "react";
+import { Field, Label, Root } 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;
+    roomName: string;
+}
+
+export const DeclineAndBlockInviteDialog: React.FunctionComponent<IProps> = ({ onFinished, roomName }) => {
+    const [shouldReport, setShouldReport] = useState<boolean>(false);
+    const [ignoreUser, setIgnoreUser] = useState<boolean>(false);
+
+    const [reportReason, setReportReason] = useState<string>("");
+    const reportReasonChanged = useCallback<ChangeEventHandler<HTMLTextAreaElement>>(
+        (e) => setReportReason(e.target.value),
+        [setReportReason],
+    );
+
+    const onCancel = useCallback(() => onFinished(false, false, false), [onFinished]);
+    const onOk = useCallback(
+        () => onFinished(true, ignoreUser, shouldReport ? reportReason : false),
+        [onFinished, ignoreUser, shouldReport, reportReason],
+    );
+
+    return (
+        <BaseDialog
+            className="mx_DeclineAndBlockInviteDialog"
+            onFinished={onCancel}
+            title={_t("decline_invitation_dialog|title")}
+            contentId="mx_Dialog_content"
+        >
+            <Root>
+                <p>{_t("decline_invitation_dialog|confirm", { roomName })}</p>
+                <LabelledToggleSwitch
+                    label={_t("report_content|ignore_user")}
+                    onChange={setIgnoreUser}
+                    caption={_t("decline_invitation_dialog|ignore_user_help")}
+                    value={ignoreUser}
+                />
+                <LabelledToggleSwitch
+                    label={_t("action|report_room")}
+                    onChange={setShouldReport}
+                    caption={_t("decline_invitation_dialog|report_room_description")}
+                    value={shouldReport}
+                />
+                <Field name="report-reason" aria-disabled={!shouldReport}>
+                    <Label htmlFor="mx_DeclineAndBlockInviteDialog_reason">
+                        {_t("room_settings|permissions|ban_reason")}
+                    </Label>
+                    <textarea
+                        id="mx_DeclineAndBlockInviteDialog_reason"
+                        className="mx_RoomReportTextArea"
+                        placeholder={_t("decline_invitation_dialog|reason_description")}
+                        rows={5}
+                        onChange={reportReasonChanged}
+                        value={shouldReport ? reportReason : ""}
+                        disabled={!shouldReport}
+                    />
+                </Field>
+                <DialogButtons
+                    primaryButton={_t("action|decline_invite")}
+                    primaryButtonClass="danger"
+                    cancelButton={_t("action|cancel")}
+                    onPrimaryButtonClick={onOk}
+                    onCancel={onCancel}
+                />
+            </Root>
+        </BaseDialog>
+    );
+};
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.tsx b/src/components/views/dialogs/InteractiveAuthDialog.tsx
index 96abb35ea4..d4ea7218c7 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.tsx
+++ b/src/components/views/dialogs/InteractiveAuthDialog.tsx
@@ -136,7 +136,7 @@ export default class InteractiveAuthDialog<T> extends React.Component<Interactiv
         // Let's pick a title, body, and other params text that we'll show to the user. The order
         // is most specific first, so stagePhase > our props > defaults.
 
-        let title = this.state.authError ? "Error" : this.props.title || _t("common|authentication");
+        let title = this.state.authError ? "Error" : (this.props.title ?? _t("common|authentication"));
         let body = this.state.authError ? null : this.props.body;
         let continueText: string | undefined;
         let continueKind: ContinueKind | undefined;
diff --git a/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx b/src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx
new file mode 100644
index 0000000000..8f699c4495
--- /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 { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
+
+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 = useMatrixClientContext();
+
+    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/MessageEditHistoryDialog.tsx b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
index b4850130db..72b11bc4e1 100644
--- a/src/components/views/dialogs/MessageEditHistoryDialog.tsx
+++ b/src/components/views/dialogs/MessageEditHistoryDialog.tsx
@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { type JSX } from "react";
 import { type MatrixEvent, EventType, RelationType, type MatrixClient, MatrixError } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -58,7 +57,7 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
         const eventId = this.props.mxEvent.getId()!;
         const client = MatrixClientPeg.safeGet();
 
-        const { resolve, reject, promise } = defer<boolean>();
+        const { resolve, reject, promise } = Promise.withResolvers<boolean>();
         let result: Awaited<ReturnType<MatrixClient["relations"]>>;
 
         try {
diff --git a/src/components/views/dialogs/ModuleUiDialog.tsx b/src/components/views/dialogs/ModuleUiDialog.tsx
index 65c36bd8c4..533b24306f 100644
--- a/src/components/views/dialogs/ModuleUiDialog.tsx
+++ b/src/components/views/dialogs/ModuleUiDialog.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, { createRef } from "react";
+import React, { createRef, type RefObject } from "react";
 import { type DialogContent, type DialogProps } from "@matrix-org/react-sdk-module-api/lib/components/DialogContent";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type ModuleApi } from "@matrix-org/react-sdk-module-api/lib/ModuleApi";
@@ -27,10 +27,10 @@ interface IState extends IScrollableBaseState {
     // nothing special
 }
 
-export class ModuleUiDialog<P extends DialogProps, C extends DialogContent<P>> extends ScrollableBaseModal<
-    IProps<P, C>,
-    IState
-> {
+export class ModuleUiDialog<
+    P extends DialogProps = DialogProps,
+    C extends DialogContent<P> = DialogContent<P>,
+> extends ScrollableBaseModal<IProps<P, C>, IState> {
     private contentRef = createRef<C>();
 
     public constructor(props: IProps<P, C>) {
@@ -74,6 +74,11 @@ export class ModuleUiDialog<P extends DialogProps, C extends DialogContent<P>> e
             ...dialogProps,
         } as unknown as P;
 
-        return <div className="mx_ModuleUiDialog">{this.props.contentFactory(contentProps, this.contentRef)}</div>;
+        // XXX: we have to fudge the types here a little as the react-sdk-module-api lacks React 19 support
+        return (
+            <div className="mx_ModuleUiDialog">
+                {this.props.contentFactory(contentProps, this.contentRef as RefObject<C>)}
+            </div>
+        );
     }
 }
diff --git a/src/components/views/dialogs/ReportRoomDialog.tsx b/src/components/views/dialogs/ReportRoomDialog.tsx
index 23a8334f41..2204153c0e 100644
--- a/src/components/views/dialogs/ReportRoomDialog.tsx
+++ b/src/components/views/dialogs/ReportRoomDialog.tsx
@@ -6,7 +6,7 @@ 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 } from "@vector-im/compound-web";
+import { Root, Field, Label, InlineSpinner, ErrorMessage, HelpMessage } from "@vector-im/compound-web";
 
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
@@ -14,10 +14,11 @@ 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;
-    onFinished(complete: boolean): void;
+    onFinished(leave: boolean): void;
 }
 
 /*
@@ -27,27 +28,26 @@ interface IProps {
 export const ReportRoomDialog: React.FC<IProps> = function ({ roomId, onFinished }) {
     const [error, setErr] = useState<string>();
     const [busy, setBusy] = useState(false);
-    const [sent, setSent] = useState(false);
     const [reason, setReason] = useState("");
+    const [leaveRoom, setLeaveRoom] = useState(false);
     const client = MatrixClientPeg.safeGet();
 
     const onReasonChange = useCallback<ChangeEventHandler<HTMLTextAreaElement>>((e) => setReason(e.target.value), []);
-    const onCancel = useCallback(() => onFinished(sent), [sent, onFinished]);
+    const onCancel = useCallback(() => onFinished(false), [onFinished]);
     const onSubmit = useCallback(async () => {
         setBusy(true);
         try {
             await client.reportRoom(roomId, reason);
-            setSent(true);
+            onFinished(leaveRoom);
         } catch (ex) {
+            setBusy(false);
             if (ex instanceof Error) {
                 setErr(ex.message);
             } else {
                 setErr("Unknown error");
             }
-        } finally {
-            setBusy(false);
         }
-    }, [roomId, reason, client]);
+    }, [roomId, reason, client, leaveRoom, onFinished]);
 
     const adminMessageMD = SdkConfig.getObject("report_event")?.get("admin_message_md", "adminMessageMD");
     let adminMessage: JSX.Element | undefined;
@@ -59,37 +59,39 @@ export const ReportRoomDialog: React.FC<IProps> = function ({ roomId, onFinished
     return (
         <BaseDialog
             className="mx_ReportRoomDialog"
-            onFinished={() => onFinished(sent)}
-            title={_t("report_room|title")}
+            onFinished={onCancel}
+            title={_t("action|report_room")}
             contentId="mx_ReportEventDialog"
         >
-            {sent && <p>{_t("report_room|sent")}</p>}
-            {!sent && (
-                <Root id="mx_ReportEventDialog" onSubmit={onSubmit}>
-                    <p>{_t("report_room|description")}</p>
-                    {adminMessage}
-                    <Field name="reason">
-                        <Label htmlFor="mx_ReportRoomDialog_reason">{_t("room_settings|permissions|ban_reason")}</Label>
-                        <textarea
-                            id="mx_ReportRoomDialog_reason"
-                            placeholder={_t("report_room|reason_placeholder")}
-                            rows={5}
-                            onChange={onReasonChange}
-                            value={reason}
-                            disabled={busy}
-                        />
-                        {error ? <ErrorMessage>{error}</ErrorMessage> : null}
-                    </Field>
-                    {busy ? <InlineSpinner /> : null}
-                    <DialogButtons
-                        primaryButton={_t("action|send_report")}
-                        onPrimaryButtonClick={onSubmit}
-                        focus={true}
-                        onCancel={onCancel}
+            <Root id="mx_ReportEventDialog" onSubmit={onSubmit}>
+                <Field name="reason">
+                    <Label htmlFor="mx_ReportRoomDialog_reason">{_t("report_room|reason_label")}</Label>
+                    <textarea
+                        id="mx_ReportRoomDialog_reason"
+                        rows={5}
+                        onChange={onReasonChange}
+                        value={reason}
                         disabled={busy}
                     />
-                </Root>
-            )}
+                    {error ? <ErrorMessage>{error}</ErrorMessage> : null}
+                    <HelpMessage>{_t("report_room|description")}</HelpMessage>
+                </Field>
+                {adminMessage}
+                {busy ? <InlineSpinner /> : null}
+                <LabelledToggleSwitch
+                    label={_t("room_list|more_options|leave_room")}
+                    value={leaveRoom}
+                    onChange={setLeaveRoom}
+                />
+                <DialogButtons
+                    primaryButton={_t("action|send_report")}
+                    onPrimaryButtonClick={onSubmit}
+                    focus={true}
+                    onCancel={onCancel}
+                    primaryButtonClass="danger"
+                    primaryDisabled={busy || !reason}
+                />
+            </Root>
         </BaseDialog>
     );
 };
diff --git a/src/components/views/dialogs/ResetIdentityDialog.tsx b/src/components/views/dialogs/ResetIdentityDialog.tsx
new file mode 100644
index 0000000000..b946ab1d79
--- /dev/null
+++ b/src/components/views/dialogs/ResetIdentityDialog.tsx
@@ -0,0 +1,49 @@
+/*
+ * 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 { MatrixClientPeg } from "../../../MatrixClientPeg";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { ResetIdentityBody, type ResetIdentityBodyVariant } from "../settings/encryption/ResetIdentityBody";
+
+interface ResetIdentityDialogProps {
+    /**
+     * Called when the dialog is complete.
+     *
+     * `ResetIdentityDialog` expects this to be provided by `Modal.createDialog`, and that it will close the dialog.
+     */
+    onFinished: () => void;
+
+    /**
+     * Called when the identity is reset (before onFinished is called).
+     */
+    onReset: () => void;
+
+    /**
+     * Which variant of this dialog to show.
+     */
+    variant: ResetIdentityBodyVariant;
+}
+
+/**
+ * The dialog for resetting the identity of the current user.
+ */
+export function ResetIdentityDialog({ onFinished, onReset, variant }: ResetIdentityDialogProps): JSX.Element {
+    const matrixClient = MatrixClientPeg.safeGet();
+
+    const onResetWrapper: () => void = () => {
+        onReset();
+        // Close the dialog
+        onFinished();
+    };
+    return (
+        <MatrixClientContext.Provider value={matrixClient}>
+            <ResetIdentityBody onReset={onResetWrapper} onCancelClick={onFinished} variant={variant} />
+        </MatrixClientContext.Provider>
+    );
+}
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.tsx b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
index 26baef9f2a..edf93558ff 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.tsx
@@ -31,13 +31,13 @@ export default class SessionRestoreErrorDialog extends React.Component<IProps> {
     };
 
     private onClearStorageClick = (): void => {
-        Modal.createDialog(QuestionDialog, {
+        const { finished } = Modal.createDialog(QuestionDialog, {
             title: _t("action|sign_out"),
             description: <div>{_t("error|session_restore|clear_storage_description")}</div>,
             button: _t("action|sign_out"),
             danger: true,
-            onFinished: this.props.onFinished,
         });
+        finished.then(([ok]) => this.props.onFinished(ok));
     };
 
     private onRefreshClick = (): void => {
diff --git a/src/components/views/dialogs/SetEmailDialog.tsx b/src/components/views/dialogs/SetEmailDialog.tsx
index 57d8ed12d4..5628df33ab 100644
--- a/src/components/views/dialogs/SetEmailDialog.tsx
+++ b/src/components/views/dialogs/SetEmailDialog.tsx
@@ -66,12 +66,12 @@ export default class SetEmailDialog extends React.Component<IProps, IState> {
         this.addThreepid = new AddThreepid(MatrixClientPeg.safeGet());
         this.addThreepid.addEmailAddress(emailAddress).then(
             () => {
-                Modal.createDialog(QuestionDialog, {
+                const { finished } = Modal.createDialog(QuestionDialog, {
                     title: _t("auth|set_email|verification_pending_title"),
                     description: _t("auth|set_email|verification_pending_description"),
                     button: _t("action|continue"),
-                    onFinished: this.onEmailDialogFinished,
                 });
+                finished.then(([ok]) => this.onEmailDialogFinished(ok));
             },
             (err) => {
                 this.setState({ emailBusy: false });
@@ -89,7 +89,7 @@ export default class SetEmailDialog extends React.Component<IProps, IState> {
         this.props.onFinished(false);
     };
 
-    private onEmailDialogFinished = (ok: boolean): void => {
+    private onEmailDialogFinished = (ok?: boolean): void => {
         if (ok) {
             this.verifyEmailAddress();
         } else {
@@ -115,12 +115,12 @@ export default class SetEmailDialog extends React.Component<IProps, IState> {
                         _t("settings|general|error_email_verification") +
                         " " +
                         _t("auth|set_email|verification_pending_description");
-                    Modal.createDialog(QuestionDialog, {
+                    const { finished } = Modal.createDialog(QuestionDialog, {
                         title: _t("auth|set_email|verification_pending_title"),
                         description: message,
                         button: _t("action|continue"),
-                        onFinished: this.onEmailDialogFinished,
                     });
+                    finished.then(([ok]) => this.onEmailDialogFinished(ok));
                 } else {
                     logger.error("Unable to verify email address: " + err);
                     Modal.createDialog(ErrorDialog, {
diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
index 29a665f05e..bb68051dfc 100644
--- a/src/components/views/dialogs/UserSettingsDialog.tsx
+++ b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -45,17 +45,16 @@ import { type NonEmptyArray } from "../../../@types/common";
 import { SDKContext, type SdkContextClass } from "../../../contexts/SDKContext";
 import { useSettingValue } from "../../../hooks/useSettings";
 import { ToastContext, useActiveToast } from "../../../contexts/ToastContext";
-import { EncryptionUserSettingsTab } from "../settings/tabs/user/EncryptionUserSettingsTab";
+import { EncryptionUserSettingsTab, type State } from "../settings/tabs/user/EncryptionUserSettingsTab";
 
 interface IProps {
     initialTabId?: UserTab;
     showMsc4108QrCode?: boolean;
-    /**
-     * If `true`, the flow for a user to reset their encryption will be shown. In this case, `initialTabId` must be `UserTab.Encryption`.
-     *
-     * If false or undefined, show the tab as normal.
+    /*
+     * The initial state of the Encryption tab.
+     * If undefined, the default state is used ("loading").
      */
-    showResetIdentity?: boolean;
+    initialEncryptionState?: State;
     sdkContext: SdkContextClass;
     onFinished(): void;
 }
@@ -99,7 +98,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
     const mjolnirEnabled = useSettingValue("feature_mjolnir");
     // store these props in state as changing tabs back and forth should clear them
     const [showMsc4108QrCode, setShowMsc4108QrCode] = useState(props.showMsc4108QrCode);
-    const [showResetIdentity, setShowResetIdentity] = useState(props.showResetIdentity);
+    const [initialEncryptionState, setInitialEncryptionState] = useState(props.initialEncryptionState);
 
     const getTabs = (): NonEmptyArray<Tab<UserTab>> => {
         const tabs: Tab<UserTab>[] = [];
@@ -195,7 +194,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
                 UserTab.Encryption,
                 _td("settings|encryption|title"),
                 <KeyIcon />,
-                <EncryptionUserSettingsTab initialState={showResetIdentity ? "reset_identity_forgot" : undefined} />,
+                <EncryptionUserSettingsTab initialState={initialEncryptionState} />,
                 "UserSettingsEncryption",
             ),
         );
@@ -234,7 +233,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
         _setActiveTabId(tabId);
         // Clear these so switching away from the tab and back to it will not show the QR code again
         setShowMsc4108QrCode(false);
-        setShowResetIdentity(false);
+        setInitialEncryptionState(undefined);
     };
 
     const [activeToast, toastRack] = useActiveToast();
diff --git a/src/components/views/dialogs/devtools/Crypto.tsx b/src/components/views/dialogs/devtools/Crypto.tsx
index a05c415f00..e491c00a73 100644
--- a/src/components/views/dialogs/devtools/Crypto.tsx
+++ b/src/components/views/dialogs/devtools/Crypto.tsx
@@ -12,6 +12,8 @@ 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";
 
 interface KeyBackupProps {
     /**
@@ -31,6 +33,16 @@ export function Crypto({ onBack }: KeyBackupProps): JSX.Element {
                 <>
                     <KeyStorage />
                     <CrossSigning />
+                    <Session />
+
+                    <button
+                        type="button"
+                        onClick={() => {
+                            Modal.createDialog(ManualDeviceKeyVerificationDialog);
+                        }}
+                    >
+                        {_t("devtools|manual_device_verification")}
+                    </button>
                 </>
             ) : (
                 <span>{_t("devtools|crypto|crypto_not_available")}</span>
@@ -254,3 +266,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/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index 14c144a538..10f4788580 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -6,27 +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 { Button } 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 { logger } from "matrix-js-sdk/src/logger";
-import { decodeRecoveryKey } from "matrix-js-sdk/src/crypto-api";
 import { type SecretStorage } from "matrix-js-sdk/src/matrix";
 
-import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
-import AccessibleButton, { type ButtonEvent } from "../../elements/AccessibleButton";
+import { Flex } from "../../../utils/Flex";
 import { _t } from "../../../../languageHandler";
-import { accessSecretStorage } from "../../../../SecurityManager";
-import Modal from "../../../../Modal";
-import DialogButtons from "../../elements/DialogButtons";
+import { EncryptionCard } from "../../settings/encryption/EncryptionCard";
+import { EncryptionCardButtons } from "../../settings/encryption/EncryptionCardButtons";
 import BaseDialog from "../BaseDialog";
-import { chromeFileInputFix } from "../../../../utils/BrowserWorkarounds";
-
-// Maximum acceptable size of a key file. It's 59 characters including the spaces we encode,
-// so this should be plenty and allow for people putting extra whitespace in the file because
-// maybe that's a thing people would do?
-const KEY_FILE_MAX_SIZE = 128;
 
 // 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;
@@ -34,399 +26,200 @@ const VALIDATION_THROTTLE_MS = 200;
 export type KeyParams = { passphrase?: string; recoveryKey?: string };
 
 interface IProps {
+    /**
+     * Information about the Secret Storage key that we want to get.
+     */
     keyInfo: SecretStorage.SecretStorageKeyDescription;
+    /**
+     * Callback to check whether the given key is correct.
+     */
     checkPrivateKey: (k: KeyParams) => Promise<boolean>;
+    /**
+     * Callback for when the user is done with this dialog.  `result` will
+     * contain information about the key that was entered, or will be `false` if
+     * the user cancelled.
+     */
     onFinished(result?: false | KeyParams): void;
 }
 
 interface IState {
+    //! The recovery key/phrase that the user entered
     recoveryKey: string;
-    recoveryKeyValid: boolean | null;
+    //! Is the recovery key/phrase correct?  `null` means no key/phrase has been entered
     recoveryKeyCorrect: boolean | null;
-    recoveryKeyFileError: boolean | null;
-    forceRecoveryKey: boolean;
-    passPhrase: string;
-    keyMatches: boolean | null;
-    resetting: boolean;
 }
 
 /*
  * Access Secure Secret Storage by requesting the user's passphrase.
  */
 export default class AccessSecretStorageDialog extends React.PureComponent<IProps, IState> {
-    private fileUpload = React.createRef<HTMLInputElement>();
-    private inputRef = React.createRef<HTMLInputElement>();
+    private inputRef = React.createRef<HTMLTextAreaElement>();
 
     public constructor(props: IProps) {
         super(props);
 
         this.state = {
             recoveryKey: "",
-            recoveryKeyValid: null,
             recoveryKeyCorrect: null,
-            recoveryKeyFileError: null,
-            forceRecoveryKey: false,
-            passPhrase: "",
-            keyMatches: null,
-            resetting: false,
         };
     }
 
     private onCancel = (): void => {
-        if (this.state.resetting) {
-            this.setState({ resetting: false });
-        }
         this.props.onFinished(false);
     };
 
-    private onUseRecoveryKeyClick = (): void => {
-        this.setState({
-            forceRecoveryKey: true,
-        });
-    };
-
     private validateRecoveryKeyOnChange = debounce(async (): Promise<void> => {
-        await this.validateRecoveryKey();
+        await this.validateRecoveryKey(this.state.recoveryKey);
     }, VALIDATION_THROTTLE_MS);
 
-    private async validateRecoveryKey(): Promise<void> {
-        if (this.state.recoveryKey === "") {
+    /**
+     * Checks whether the security key/phrase is correct.
+     *
+     * Sets `state.recoveryKeyCorrect` accordingly, and if the key/phrase is
+     * correct, returns a `KeyParams` structure.
+     */
+    private async validateRecoveryKey(recoveryKey: string): Promise<KeyParams | undefined> {
+        recoveryKey = recoveryKey.trim();
+
+        if (recoveryKey === "") {
             this.setState({
-                recoveryKeyValid: null,
                 recoveryKeyCorrect: null,
             });
             return;
         }
 
+        const hasPassphrase = this.props.keyInfo?.passphrase?.salt && this.props.keyInfo?.passphrase?.iterations;
+
+        // If the user has a passphrase, we want to try validating it both as a
+        // key and as a passphrase.  We first try to validate it as a key, since
+        // that check is faster.
+
         try {
-            const cli = MatrixClientPeg.safeGet();
-            const decodedKey = decodeRecoveryKey(this.state.recoveryKey);
-            const correct = await cli.secretStorage.checkKey(decodedKey, this.props.keyInfo);
-            this.setState({
-                recoveryKeyValid: true,
-                recoveryKeyCorrect: correct,
-            });
-        } catch {
-            this.setState({
-                recoveryKeyValid: false,
-                recoveryKeyCorrect: false,
-            });
+            const input = { recoveryKey };
+            const recoveryKeyCorrect = await this.props.checkPrivateKey(input);
+            if (recoveryKeyCorrect) {
+                this.setState({ recoveryKeyCorrect });
+                return input;
+            }
+        } catch {}
+
+        if (hasPassphrase) {
+            try {
+                const input = { passphrase: recoveryKey };
+                const recoveryKeyCorrect = await this.props.checkPrivateKey(input);
+                if (recoveryKeyCorrect) {
+                    this.setState({ recoveryKeyCorrect });
+                    return input;
+                }
+            } catch {}
         }
+
+        this.setState({
+            recoveryKeyCorrect: false,
+        });
     }
 
-    private onRecoveryKeyChange = (ev: ChangeEvent<HTMLInputElement>): void => {
+    private onRecoveryKeyChange = (ev: ChangeEvent<HTMLTextAreaElement>): void => {
         this.setState({
             recoveryKey: ev.target.value,
-            recoveryKeyFileError: null,
         });
 
-        // also clear the file upload control so that the user can upload the same file
-        // the did before (otherwise the onchange wouldn't fire)
-        if (this.fileUpload.current) this.fileUpload.current.value = "";
-
-        // We don't use Field's validation here because a) we want it in a separate place rather
-        // than in a tooltip and b) we want it to display feedback based on the uploaded file
-        // as well as the text box. Ideally we would refactor Field's validation logic so we could
+        // We don't use Field's validation here because we want it in a separate place rather
+        // than in a tooltip. Ideally we would refactor Field's validation logic so we could
         // re-use some of it.
         this.validateRecoveryKeyOnChange();
     };
 
-    private onRecoveryKeyFileChange = async (ev: ChangeEvent<HTMLInputElement>): Promise<void> => {
-        if (!ev.target.files?.length) return;
-
-        const f = ev.target.files[0];
-
-        if (f.size > KEY_FILE_MAX_SIZE) {
-            this.setState({
-                recoveryKeyFileError: true,
-                recoveryKeyCorrect: false,
-                recoveryKeyValid: false,
-            });
-        } else {
-            const contents = await f.text();
-            // test it's within the base58 alphabet. We could be more strict here, eg. require the
-            // right number of characters, but it's really just to make sure that what we're reading is
-            // text because we'll put it in the text field.
-            if (/^[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz\s]+$/.test(contents)) {
-                this.setState({
-                    recoveryKeyFileError: null,
-                    recoveryKey: contents.trim(),
-                });
-                await this.validateRecoveryKey();
-            } else {
-                this.setState({
-                    recoveryKeyFileError: true,
-                    recoveryKeyCorrect: false,
-                    recoveryKeyValid: false,
-                    recoveryKey: "",
-                });
-            }
-        }
-    };
-
-    private onRecoveryKeyFileUploadClick = (): void => {
-        this.fileUpload.current?.click();
-    };
-
-    private onPassPhraseNext = async (ev: FormEvent<HTMLFormElement> | React.MouseEvent): Promise<void> => {
-        ev.preventDefault();
-
-        if (this.state.passPhrase.length <= 0) {
-            this.inputRef.current?.focus();
-            return;
-        }
-
-        this.setState({ keyMatches: null });
-        const input = { passphrase: this.state.passPhrase };
-        const keyMatches = await this.props.checkPrivateKey(input);
-        if (keyMatches) {
-            this.props.onFinished(input);
-        } else {
-            this.setState({ keyMatches });
-            this.inputRef.current?.focus();
-        }
-    };
-
     private onRecoveryKeyNext = async (ev: FormEvent<HTMLFormElement> | React.MouseEvent): Promise<void> => {
         ev.preventDefault();
 
-        if (!this.state.recoveryKeyValid) return;
+        const keyParams = await this.validateRecoveryKey(this.state.recoveryKey);
 
-        this.setState({ keyMatches: null });
-        const input = { recoveryKey: this.state.recoveryKey };
-        const keyMatches = await this.props.checkPrivateKey(input);
-        if (keyMatches) {
-            this.props.onFinished(input);
+        if (keyParams !== undefined) {
+            this.props.onFinished(keyParams);
         } else {
-            this.setState({ keyMatches });
+            this.inputRef.current?.focus();
         }
     };
 
-    private onPassPhraseChange = (ev: ChangeEvent<HTMLInputElement>): void => {
-        this.setState({
-            passPhrase: ev.target.value,
-            keyMatches: null,
-        });
-    };
+    private getRecoveryKeyFeedback(): React.ReactNode | null {
+        let validationText: string;
+        let classes: string | undefined;
 
-    private onResetAllClick = (ev: ButtonEvent): void => {
-        ev.preventDefault();
-        this.setState({ resetting: true });
-    };
-
-    private onConfirmResetAllClick = async (): Promise<void> => {
-        // Hide ourselves so the user can interact with the reset dialogs.
-        // We don't conclude the promise chain (onFinished) yet to avoid confusing
-        // any upstream code flows.
-        //
-        // Note: this will unmount us, so don't call `setState` or anything in the
-        // rest of this function.
-        Modal.toggleCurrentDialogVisibility();
-
-        try {
-            // Force reset secret storage (which resets the key backup)
-            await accessSecretStorage(
-                async (): Promise<void> => {
-                    // Now we can indicate that the user is done pressing buttons, finally.
-                    // Upstream flows will detect the new secret storage, key backup, etc and use it.
-                    this.props.onFinished({});
-                },
-                { forceReset: true, resetCrossSigning: true },
-            );
-        } catch (e) {
-            logger.error(e);
-            this.props.onFinished(false);
-        }
-    };
-
-    private getKeyValidationText(): string {
-        if (this.state.recoveryKeyFileError) {
-            return _t("encryption|access_secret_storage_dialog|key_validation_text|wrong_file_type");
-        } else if (this.state.recoveryKeyCorrect) {
-            return _t("encryption|access_secret_storage_dialog|key_validation_text|recovery_key_is_correct");
-        } else if (this.state.recoveryKeyValid) {
-            return _t("encryption|access_secret_storage_dialog|key_validation_text|wrong_security_key");
-        } else if (this.state.recoveryKeyValid === null) {
-            return "";
+        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 _t("encryption|access_secret_storage_dialog|key_validation_text|invalid_security_key");
-        }
-    }
-
-    public render(): React.ReactNode {
-        const hasPassphrase = this.props.keyInfo?.passphrase?.salt && this.props.keyInfo?.passphrase?.iterations;
-
-        const resetLine = (
-            <strong className="mx_AccessSecretStorageDialog_reset">
-                {_t("encryption|reset_all_button", undefined, {
-                    a: (sub) => (
-                        <AccessibleButton
-                            kind="link_inline"
-                            onClick={this.onResetAllClick}
-                            className="mx_AccessSecretStorageDialog_reset_link"
-                        >
-                            {sub}
-                        </AccessibleButton>
-                    ),
-                })}
-            </strong>
-        );
-
-        let content;
-        let title;
-        let titleClass;
-        if (this.state.resetting) {
-            title = _t("encryption|access_secret_storage_dialog|reset_title");
-            titleClass = ["mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_resetBadge"];
-            content = (
-                <div>
-                    <p>{_t("encryption|access_secret_storage_dialog|reset_warning_1")}</p>
-                    <p>{_t("encryption|access_secret_storage_dialog|reset_warning_2")}</p>
-                    <DialogButtons
-                        primaryButton={_t("action|reset")}
-                        onPrimaryButtonClick={this.onConfirmResetAllClick}
-                        hasCancel={true}
-                        onCancel={this.onCancel}
-                        focus={false}
-                        primaryButtonClass="danger"
-                    />
-                </div>
-            );
-        } else if (hasPassphrase && !this.state.forceRecoveryKey) {
-            title = _t("encryption|access_secret_storage_dialog|security_phrase_title");
-            titleClass = ["mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_securePhraseTitle"];
-
-            let keyStatus;
-            if (this.state.keyMatches === false) {
-                keyStatus = (
-                    <div className="mx_AccessSecretStorageDialog_keyStatus">
-                        {"\uD83D\uDC4E "}
-                        {_t("encryption|access_secret_storage_dialog|security_phrase_incorrect_error")}
-                    </div>
-                );
-            } else {
-                keyStatus = <div className="mx_AccessSecretStorageDialog_keyStatus" />;
-            }
-
-            content = (
-                <div>
-                    <p>
-                        {_t(
-                            "encryption|access_secret_storage_dialog|enter_phrase_or_key_prompt",
-                            {},
-                            {
-                                button: (s) => (
-                                    <AccessibleButton kind="link_inline" onClick={this.onUseRecoveryKeyClick}>
-                                        {s}
-                                    </AccessibleButton>
-                                ),
-                            },
-                        )}
-                    </p>
-
-                    <form className="mx_AccessSecretStorageDialog_primaryContainer" onSubmit={this.onPassPhraseNext}>
-                        <Field
-                            inputRef={this.inputRef}
-                            id="mx_passPhraseInput"
-                            className="mx_AccessSecretStorageDialog_passPhraseInput"
-                            type="password"
-                            label={_t("encryption|access_secret_storage_dialog|security_phrase_title")}
-                            value={this.state.passPhrase}
-                            onChange={this.onPassPhraseChange}
-                            autoFocus={true}
-                            autoComplete="new-password"
-                        />
-                        {keyStatus}
-                        <DialogButtons
-                            primaryButton={_t("action|continue")}
-                            onPrimaryButtonClick={this.onPassPhraseNext}
-                            hasCancel={true}
-                            onCancel={this.onCancel}
-                            focus={false}
-                            primaryDisabled={this.state.passPhrase.length === 0}
-                            additive={resetLine}
-                        />
-                    </form>
-                </div>
-            );
-        } else {
-            title = _t("encryption|access_secret_storage_dialog|security_key_title");
-            titleClass = ["mx_AccessSecretStorageDialog_titleWithIcon mx_AccessSecretStorageDialog_secureBackupTitle"];
-
-            const feedbackClasses = classNames({
+            // 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--valid": this.state.recoveryKeyCorrect === true,
-                "mx_AccessSecretStorageDialog_recoveryKeyFeedback--invalid": this.state.recoveryKeyCorrect === false,
+                "mx_AccessSecretStorageDialog_recoveryKeyFeedback--invalid": true,
             });
-            const recoveryKeyFeedback = <div className={feedbackClasses}>{this.getKeyValidationText()}</div>;
-
-            content = (
-                <div>
-                    <p>{_t("encryption|access_secret_storage_dialog|use_security_key_prompt")}</p>
-
-                    <form
-                        className="mx_AccessSecretStorageDialog_primaryContainer"
-                        onSubmit={this.onRecoveryKeyNext}
-                        spellCheck={false}
-                        autoComplete="off"
-                    >
-                        <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry">
-                            <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry_textInput">
-                                <Field
-                                    type="password"
-                                    id="mx_securityKey"
-                                    label={_t("encryption|access_secret_storage_dialog|security_key_title")}
-                                    value={this.state.recoveryKey}
-                                    onChange={this.onRecoveryKeyChange}
-                                    autoFocus={true}
-                                    forceValidity={this.state.recoveryKeyCorrect ?? undefined}
-                                    autoComplete="off"
-                                />
-                            </div>
-                            <span className="mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText">
-                                {_t("encryption|access_secret_storage_dialog|separator", {
-                                    recoveryFile: "",
-                                    securityKey: "",
-                                })}
-                            </span>
-                            <div>
-                                <input
-                                    type="file"
-                                    className="mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput"
-                                    ref={this.fileUpload}
-                                    onClick={chromeFileInputFix}
-                                    onChange={this.onRecoveryKeyFileChange}
-                                />
-                                <AccessibleButton kind="primary" onClick={this.onRecoveryKeyFileUploadClick}>
-                                    {_t("action|upload")}
-                                </AccessibleButton>
-                            </div>
-                        </div>
-                        {recoveryKeyFeedback}
-                        <DialogButtons
-                            primaryButton={_t("action|continue")}
-                            onPrimaryButtonClick={this.onRecoveryKeyNext}
-                            hasCancel={true}
-                            cancelButton={_t("action|go_back")}
-                            cancelButtonClass="warning"
-                            onCancel={this.onCancel}
-                            focus={false}
-                            primaryDisabled={!this.state.recoveryKeyValid}
-                            additive={resetLine}
-                        />
-                    </form>
-                </div>
-            );
         }
 
         return (
-            <BaseDialog
-                className="mx_AccessSecretStorageDialog"
-                onFinished={this.props.onFinished}
-                title={title}
-                titleClass={titleClass}
-            >
-                <div>{content}</div>
+            <Flex align="center" className={classes}>
+                {validationText}
+            </Flex>
+        );
+    }
+
+    public render(): React.ReactNode {
+        const title = _t("encryption|access_secret_storage_dialog|security_key_title");
+
+        const recoveryKeyFeedback = this.getRecoveryKeyFeedback();
+        const content = (
+            <div>
+                <form
+                    className="mx_AccessSecretStorageDialog_primaryContainer"
+                    onSubmit={this.onRecoveryKeyNext}
+                    spellCheck={false}
+                    autoComplete="off"
+                >
+                    <div className="mx_AccessSecretStorageDialog_recoveryKeyEntry">
+                        <Field
+                            inputRef={this.inputRef}
+                            element="textarea"
+                            rows={2}
+                            cols={45}
+                            id="mx_securityKey"
+                            label={_t("encryption|access_secret_storage_dialog|security_key_title")}
+                            value={this.state.recoveryKey}
+                            onChange={this.onRecoveryKeyChange}
+                            autoFocus={true}
+                            forceValidity={this.state.recoveryKeyCorrect ?? undefined}
+                            autoComplete="off"
+                        />
+                    </div>
+                    {recoveryKeyFeedback}
+                    <EncryptionCardButtons>
+                        <Button disabled={!this.state.recoveryKeyCorrect} onClick={this.onRecoveryKeyNext}>
+                            {_t("action|continue")}
+                        </Button>
+                        <Button kind="tertiary" onClick={this.onCancel}>
+                            {_t("action|cancel")}
+                        </Button>
+                    </EncryptionCardButtons>
+                </form>
+            </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 (
+            <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/ConfirmDestroyCrossSigningDialog.tsx b/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
deleted file mode 100644
index 5e3136c5ad..0000000000
--- a/src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx
+++ /dev/null
@@ -1,49 +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 React from "react";
-
-import { _t } from "../../../../languageHandler";
-import BaseDialog from "../BaseDialog";
-import DialogButtons from "../../elements/DialogButtons";
-
-interface IProps {
-    onFinished: (success?: boolean) => void;
-}
-
-export default class ConfirmDestroyCrossSigningDialog extends React.Component<IProps> {
-    private onConfirm = (): void => {
-        this.props.onFinished(true);
-    };
-
-    private onDecline = (): void => {
-        this.props.onFinished(false);
-    };
-
-    public render(): React.ReactNode {
-        return (
-            <BaseDialog
-                className="mx_ConfirmDestroyCrossSigningDialog"
-                hasCancel={true}
-                onFinished={this.props.onFinished}
-                title={_t("encryption|destroy_cross_signing_dialog|title")}
-            >
-                <div className="mx_ConfirmDestroyCrossSigningDialog_content">
-                    <p>{_t("encryption|destroy_cross_signing_dialog|warning")}</p>
-                </div>
-                <DialogButtons
-                    primaryButton={_t("encryption|destroy_cross_signing_dialog|primary_button_text")}
-                    onPrimaryButtonClick={this.onConfirm}
-                    primaryButtonClass="danger"
-                    cancelButton={_t("action|cancel")}
-                    onCancel={this.onDecline}
-                />
-            </BaseDialog>
-        );
-    }
-}
diff --git a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
index a545b15337..419a12df89 100644
--- a/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
+++ b/src/components/views/dialogs/spotlight/SpotlightDialog.tsx
@@ -608,6 +608,21 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                             {filterToLabel(Filter.People)}
                         </Option>
                     )}
+                    {filter === null && (
+                        <Option
+                            id="mx_SpotlightDialog_button_searchMessages"
+                            className="mx_SpotlightDialog_searchMessages"
+                            onClick={() => {
+                                defaultDispatcher.dispatch({
+                                    action: Action.FocusMessageSearch,
+                                    initialText: trimmedQuery,
+                                });
+                                onFinished();
+                            }}
+                        >
+                            {_t("spotlight_dialog|messages_label")}
+                        </Option>
+                    )}
                 </div>
             </div>
         );
@@ -997,28 +1012,6 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
             );
         }
 
-        let messageSearchSection: JSX.Element | undefined;
-        if (filter === null) {
-            messageSearchSection = (
-                <div
-                    className="mx_SpotlightDialog_section mx_SpotlightDialog_otherSearches"
-                    role="group"
-                    aria-labelledby="mx_SpotlightDialog_section_messageSearch"
-                >
-                    <h4 id="mx_SpotlightDialog_section_messageSearch">
-                        {_t("spotlight_dialog|message_search_section_title")}
-                    </h4>
-                    <div className="mx_SpotlightDialog_otherSearches_messageSearchText">
-                        {_t(
-                            "spotlight_dialog|search_messages_hint",
-                            {},
-                            { icon: () => <div className="mx_SpotlightDialog_otherSearches_messageSearchIcon" /> },
-                        )}
-                    </div>
-                </div>
-            );
-        }
-
         content = (
             <>
                 {peopleSection}
@@ -1031,7 +1024,6 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                 {hiddenResultsSection}
                 {otherSearchesSection}
                 {groupChatSection}
-                {messageSearchSection}
             </>
         );
     } else {
diff --git a/src/components/views/directory/NetworkDropdown.tsx b/src/components/views/directory/NetworkDropdown.tsx
index 82714915cc..e46b89578a 100644
--- a/src/components/views/directory/NetworkDropdown.tsx
+++ b/src/components/views/directory/NetworkDropdown.tsx
@@ -222,10 +222,10 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
                         const [ok, newServer] = await finished;
                         if (!ok) return;
 
-                        if (!allServers.includes(newServer)) {
-                            setUserDefinedServers([...userDefinedServers, newServer]);
+                        if (!allServers.includes(newServer!)) {
+                            setUserDefinedServers([...userDefinedServers, newServer!]);
                             setConfig({
-                                roomServer: newServer,
+                                roomServer: newServer!,
                             });
                         }
                     }}
diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 378c2dfdc1..a3e8a57c47 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -10,8 +10,6 @@ import React, {
     type JSX,
     type ComponentProps,
     type ComponentPropsWithoutRef,
-    forwardRef,
-    type FunctionComponent,
     type ReactElement,
     type KeyboardEvent,
     type Ref,
@@ -100,6 +98,8 @@ type Props<T extends ElementType = "div"> = {
      * Whether the tooltip should be disabled.
      */
     disableTooltip?: TooltipProps["disabled"];
+
+    ref?: Ref<HTMLElementTagNameMap[T]>;
 };
 
 export type ButtonProps<T extends ElementType> = Props<T> & Omit<ComponentPropsWithoutRef<T>, keyof Props<T>>;
@@ -119,28 +119,33 @@ type RenderedElementProps<T extends ElementType> = React.InputHTMLAttributes<Ele
  * @param {Object} props  react element properties
  * @returns {Object} rendered react
  */
-const AccessibleButton = forwardRef(function <T extends ElementType = typeof defaultElement>(
-    {
-        element,
-        onClick,
-        children,
-        kind,
-        disabled,
-        className,
-        onKeyDown,
-        onKeyUp,
-        triggerOnMouseDown,
-        title,
-        caption,
-        placement = "right",
-        onTooltipOpenChange,
-        disableTooltip,
-        ...restProps
-    }: ButtonProps<T>,
-    ref: Ref<HTMLElementTagNameMap[T]>,
-): JSX.Element {
-    const newProps = restProps as RenderedElementProps<T>;
-    newProps["aria-label"] = newProps["aria-label"] ?? title;
+const AccessibleButton = function AccessibleButton<T extends ElementType = typeof defaultElement>({
+    element,
+    onClick,
+    children,
+    kind,
+    disabled,
+    className,
+    onKeyDown,
+    onKeyUp,
+    triggerOnMouseDown,
+    title,
+    caption,
+    placement = "right",
+    onTooltipOpenChange,
+    disableTooltip,
+    role = "button",
+    tabIndex = 0,
+    ref,
+    ...restProps
+}: ButtonProps<T>): JSX.Element {
+    const newProps = {
+        ...restProps,
+        tabIndex,
+        role,
+        "aria-label": restProps["aria-label"] ?? title,
+    } as RenderedElementProps<T>;
+
     if (disabled) {
         newProps["aria-disabled"] = true;
         newProps["disabled"] = true;
@@ -219,14 +224,7 @@ const AccessibleButton = forwardRef(function <T extends ElementType = typeof def
         );
     }
     return button;
-});
-
-// Type assertion required due to forwardRef type workaround in react.d.ts
-(AccessibleButton as FunctionComponent).defaultProps = {
-    role: "button",
-    tabIndex: 0,
 };
-(AccessibleButton as FunctionComponent).displayName = "AccessibleButton";
 
 interface RefProp<T extends ElementType> {
     ref?: Ref<HTMLElementTagNameMap[T]>;
diff --git a/src/components/views/elements/ImageView.tsx b/src/components/views/elements/ImageView.tsx
index b4c3b72334..e3ee6f20d5 100644
--- a/src/components/views/elements/ImageView.tsx
+++ b/src/components/views/elements/ImageView.tsx
@@ -8,7 +8,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, createRef, type CSSProperties, useRef, useState } from "react";
+import React, { type JSX, createRef, type CSSProperties, useRef, useState, useMemo } from "react";
 import FocusLock from "react-focus-lock";
 import { type MatrixEvent, parseErrorResponse } from "matrix-js-sdk/src/matrix";
 
@@ -33,6 +33,7 @@ import AccessibleButton from "./AccessibleButton";
 import Modal from "../../../Modal";
 import ErrorDialog from "../dialogs/ErrorDialog";
 import { FileDownloader } from "../../../utils/FileDownloader";
+import { MediaEventHelper } from "../../../utils/MediaEventHelper.ts";
 
 // Max scale to keep gaps around the image
 const MAX_SCALE = 0.95;
@@ -549,7 +550,7 @@ 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} />
+                        <DownloadButton url={this.props.src} fileName={this.props.name} mxEvent={this.props.mxEvent} />
                         {contextMenuButton}
                         <AccessibleButton
                             className="mx_ImageView_button mx_ImageView_button_close"
@@ -582,10 +583,19 @@ export default class ImageView extends React.Component<IProps, IState> {
     }
 }
 
-function DownloadButton({ url, fileName }: { url: string; fileName?: string }): JSX.Element {
+function DownloadButton({
+    url,
+    fileName,
+    mxEvent,
+}: {
+    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]);
 
     function showError(e: unknown): void {
         Modal.createDialog(ErrorDialog, {
@@ -625,7 +635,7 @@ function DownloadButton({ url, fileName }: { url: string; fileName?: string }):
     async function downloadBlob(blob: Blob): Promise<void> {
         await downloader.download({
             blob,
-            name: fileName ?? _t("common|image"),
+            name: mediaEventHelper?.fileName ?? fileName ?? _t("common|image"),
         });
         setLoading(false);
     }
diff --git a/src/components/views/elements/LabelledToggleSwitch.tsx b/src/components/views/elements/LabelledToggleSwitch.tsx
index 1fa2e42b19..921241d62e 100644
--- a/src/components/views/elements/LabelledToggleSwitch.tsx
+++ b/src/components/views/elements/LabelledToggleSwitch.tsx
@@ -6,9 +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 React from "react";
+import React, { type FC, useId } from "react";
 import classNames from "classnames";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
 
 import ToggleSwitch from "./ToggleSwitch";
 import { Caption } from "../typography/Caption";
@@ -35,41 +34,50 @@ interface IProps {
     "data-testid"?: string;
 }
 
-export default class LabelledToggleSwitch extends React.PureComponent<IProps> {
-    private readonly id = `mx_LabelledToggleSwitch_${secureRandomString(12)}`;
+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}
+        />
+    );
 
-    public render(): React.ReactNode {
-        // This is a minimal version of a SettingsFlag
-        const { label, caption } = this.props;
-        let firstPart = (
-            <span className="mx_SettingsFlag_label">
-                <div id={this.id}>{label}</div>
-                {caption && <Caption id={`${this.id}_caption`}>{caption}</Caption>}
-            </span>
-        );
-        let secondPart = (
-            <ToggleSwitch
-                checked={this.props.value}
-                disabled={this.props.disabled}
-                onChange={this.props.onChange}
-                tooltip={this.props.tooltip}
-                aria-labelledby={this.id}
-                aria-describedby={caption ? `${this.id}_caption` : undefined}
-            />
-        );
-
-        if (this.props.toggleInFront) {
-            [firstPart, secondPart] = [secondPart, firstPart];
-        }
-
-        const classes = classNames("mx_SettingsFlag", this.props.className, {
-            mx_SettingsFlag_toggleInFront: this.props.toggleInFront,
-        });
-        return (
-            <div data-testid={this.props["data-testid"]} className={classes}>
-                {firstPart}
-                {secondPart}
-            </div>
-        );
+    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/LanguageDropdown.tsx b/src/components/views/elements/LanguageDropdown.tsx
index c4a72c4f4f..7bf50f7806 100644
--- a/src/components/views/elements/LanguageDropdown.tsx
+++ b/src/components/views/elements/LanguageDropdown.tsx
@@ -11,7 +11,6 @@ import React, { type ReactElement } from "react";
 import classNames from "classnames";
 
 import * as languageHandler from "../../../languageHandler";
-import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 import Spinner from "./Spinner";
 import Dropdown from "./Dropdown";
@@ -29,7 +28,7 @@ function languageMatchesSearchQuery(query: string, language: Languages[0]): bool
 interface IProps {
     className?: string;
     onOptionChange: (language: string) => void;
-    value?: string;
+    value: string;
     disabled?: boolean;
 }
 
@@ -103,17 +102,6 @@ export default class LanguageDropdown extends React.Component<IProps, IState> {
             return <div key={language.value}>{language.labelInTargetLanguage}</div>;
         }) as NonEmptyArray<ReactElement & { key: string }>;
 
-        // default value here too, otherwise we need to handle null / undefined
-        // values between mounting and the initial value propagating
-        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/ true);
-        let value: string | undefined;
-        if (language) {
-            value = this.props.value || language;
-        } else {
-            language = navigator.language || navigator.userLanguage;
-            value = this.props.value || language;
-        }
-
         return (
             <Dropdown
                 id="mx_LanguageDropdown"
@@ -121,7 +109,7 @@ export default class LanguageDropdown extends React.Component<IProps, IState> {
                 onOptionChange={this.props.onOptionChange}
                 onSearchChange={this.onSearchChange}
                 searchEnabled={true}
-                value={value}
+                value={this.props.value}
                 label={_t("language_dropdown_label")}
                 disabled={this.props.disabled}
             >
diff --git a/src/components/views/elements/PollCreateDialog.tsx b/src/components/views/elements/PollCreateDialog.tsx
index 8e23074ca5..41a3bc9dfb 100644
--- a/src/components/views/elements/PollCreateDialog.tsx
+++ b/src/components/views/elements/PollCreateDialog.tsx
@@ -167,18 +167,18 @@ export default class PollCreateDialog extends ScrollableBaseModal<IProps, IState
             .then(() => this.props.onFinished(true))
             .catch((e) => {
                 console.error("Failed to post poll:", e);
-                Modal.createDialog(QuestionDialog, {
+                const { finished } = Modal.createDialog(QuestionDialog, {
                     title: _t("poll|failed_send_poll_title"),
                     description: _t("poll|failed_send_poll_description"),
                     button: _t("action|try_again"),
                     cancelButton: _t("action|cancel"),
-                    onFinished: (tryAgain: boolean) => {
-                        if (!tryAgain) {
-                            this.cancel();
-                        } else {
-                            this.setState({ busy: false, canSubmit: true });
-                        }
-                    },
+                });
+                finished.then(([tryAgain]) => {
+                    if (!tryAgain) {
+                        this.cancel();
+                    } else {
+                        this.setState({ busy: false, canSubmit: true });
+                    }
                 });
             });
     }
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 6740534711..430f205377 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -28,9 +28,10 @@ interface IProps {
 const showPickerDialog = (
     title: string | undefined,
     serverConfig: ValidatedServerConfig,
-    onFinished: (config: ValidatedServerConfig) => void,
+    onFinished: (config?: ValidatedServerConfig) => void,
 ): void => {
-    Modal.createDialog(ServerPickerDialog, { title, serverConfig, onFinished });
+    const { finished } = Modal.createDialog(ServerPickerDialog, { title, serverConfig });
+    finished.then(([config]) => onFinished(config));
 };
 
 const onHelpClick = (): void => {
diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index a267999f5b..88a1ab1bd6 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -10,7 +10,6 @@ import React, { type ReactElement } from "react";
 
 import Dropdown from "../../views/elements/Dropdown";
 import PlatformPeg from "../../../PlatformPeg";
-import SettingsStore from "../../../settings/SettingsStore";
 import { _t, getUserLanguage } from "../../../languageHandler";
 import Spinner from "./Spinner";
 import { type NonEmptyArray } from "../../../@types/common";
@@ -105,17 +104,6 @@ export default class SpellCheckLanguagesDropdown extends React.Component<
             return <div key={language.value}>{language.label}</div>;
         }) as NonEmptyArray<ReactElement & { key: string }>;
 
-        // default value here too, otherwise we need to handle null / undefined;
-        // values between mounting and the initial value propagating
-        let language = SettingsStore.getValue("language", null, /*excludeDefault:*/ true);
-        let value: string | undefined;
-        if (language) {
-            value = this.props.value || language;
-        } else {
-            language = navigator.language || navigator.userLanguage;
-            value = this.props.value || language;
-        }
-
         return (
             <Dropdown
                 id="mx_LanguageDropdown"
@@ -123,7 +111,7 @@ export default class SpellCheckLanguagesDropdown extends React.Component<
                 onOptionChange={this.props.onOptionChange}
                 onSearchChange={this.onSearchChange}
                 searchEnabled={true}
-                value={value}
+                value={this.props.value}
                 label={_t("language_dropdown_label")}
                 placeholder={_t("settings|general|spell_check_locale_placeholder")}
             >
diff --git a/src/components/views/location/Marker.tsx b/src/components/views/location/Marker.tsx
index 13faa8cb68..8502580c2e 100644
--- a/src/components/views/location/Marker.tsx
+++ b/src/components/views/location/Marker.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 ReactNode, useState } from "react";
+import React, { type JSX, type ReactNode, type Ref, useState } from "react";
 import classNames from "classnames";
 import { type RoomMember } from "matrix-js-sdk/src/matrix";
 import LocationIcon from "@vector-im/compound-design-tokens/assets/web/icons/location-pin-solid";
@@ -21,6 +21,7 @@ interface Props {
     // use member text color as background
     useMemberColor?: boolean;
     tooltip?: ReactNode;
+    ref?: Ref<HTMLDivElement>;
 }
 
 /**
@@ -55,7 +56,7 @@ const OptionalTooltip: React.FC<{
 /**
  * Generic location marker
  */
-const Marker = React.forwardRef<HTMLDivElement, Props>(({ id, roomMember, useMemberColor, tooltip }, ref) => {
+const Marker = ({ id, roomMember, useMemberColor, tooltip, ref }: Props): JSX.Element => {
     const memberColorClass = useMemberColor && roomMember ? getUserNameColorClass(roomMember.userId) : "";
     return (
         <div
@@ -82,6 +83,6 @@ const Marker = React.forwardRef<HTMLDivElement, Props>(({ id, roomMember, useMem
             </OptionalTooltip>
         </div>
     );
-});
+};
 
 export default Marker;
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
index b3185921bb..f8efd8381e 100644
--- a/src/components/views/messages/CallEvent.tsx
+++ b/src/components/views/messages/CallEvent.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, { forwardRef, useCallback, useContext, useMemo } from "react";
+import React, { type Ref, useCallback, useContext, useMemo, type JSX } from "react";
 
 import type { MatrixEvent, RoomMember } from "matrix-js-sdk/src/matrix";
 import { ConnectionState, type ElementCall } from "../../../models/Call";
@@ -37,60 +37,69 @@ interface ActiveCallEventProps {
     buttonKind: AccessibleButtonKind;
     buttonDisabledTooltip?: string;
     onButtonClick: ((ev: ButtonEvent) => void) | null;
+    ref?: Ref<HTMLDivElement>;
 }
 
-const ActiveCallEvent = forwardRef<any, ActiveCallEventProps>(
-    ({ mxEvent, call, participatingMembers, buttonText, buttonKind, buttonDisabledTooltip, onButtonClick }, ref) => {
-        const senderName = useMemo(() => mxEvent.sender?.name ?? mxEvent.getSender(), [mxEvent]);
+const ActiveCallEvent = ({
+    mxEvent,
+    call,
+    participatingMembers,
+    buttonText,
+    buttonKind,
+    buttonDisabledTooltip,
+    onButtonClick,
+    ref,
+}: ActiveCallEventProps): JSX.Element => {
+    const senderName = useMemo(() => mxEvent.sender?.name ?? mxEvent.getSender(), [mxEvent]);
 
-        const facePileMembers = useMemo(() => participatingMembers.slice(0, MAX_FACES), [participatingMembers]);
-        const facePileOverflow = participatingMembers.length > facePileMembers.length;
+    const facePileMembers = useMemo(() => participatingMembers.slice(0, MAX_FACES), [participatingMembers]);
+    const facePileOverflow = participatingMembers.length > facePileMembers.length;
 
-        return (
-            <div className="mx_CallEvent_wrapper" ref={ref}>
-                <div className="mx_CallEvent mx_CallEvent_active">
-                    <MemberAvatar
-                        member={mxEvent.sender}
-                        fallbackUserId={mxEvent.getSender()}
-                        viewUserOnClick
-                        size="24px"
-                    />
-                    <div className="mx_CallEvent_columns">
-                        <div className="mx_CallEvent_details">
-                            <span className="mx_CallEvent_title">
-                                {_t("timeline|m.call|video_call_started_text", { name: senderName })}
-                            </span>
-                            <LiveContentSummary
-                                type={LiveContentType.Video}
-                                text={_t("voip|video_call")}
-                                active={false}
-                                participantCount={participatingMembers.length}
-                            />
-                            <FacePile members={facePileMembers} size="24px" overflow={facePileOverflow} />
-                        </div>
-                        {call && <SessionDuration session={call.session} />}
-                        <AccessibleButton
-                            className="mx_CallEvent_button"
-                            kind={buttonKind}
-                            disabled={onButtonClick === null || buttonDisabledTooltip !== undefined}
-                            onClick={onButtonClick}
-                            title={buttonDisabledTooltip}
-                        >
-                            {buttonText}
-                        </AccessibleButton>
+    return (
+        <div className="mx_CallEvent_wrapper" ref={ref}>
+            <div className="mx_CallEvent mx_CallEvent_active">
+                <MemberAvatar
+                    member={mxEvent.sender}
+                    fallbackUserId={mxEvent.getSender()}
+                    viewUserOnClick
+                    size="24px"
+                />
+                <div className="mx_CallEvent_columns">
+                    <div className="mx_CallEvent_details">
+                        <span className="mx_CallEvent_title">
+                            {_t("timeline|m.call|video_call_started_text", { name: senderName })}
+                        </span>
+                        <LiveContentSummary
+                            type={LiveContentType.Video}
+                            text={_t("voip|video_call")}
+                            active={false}
+                            participantCount={participatingMembers.length}
+                        />
+                        <FacePile members={facePileMembers} size="24px" overflow={facePileOverflow} />
                     </div>
+                    {call && <SessionDuration session={call.session} />}
+                    <AccessibleButton
+                        className="mx_CallEvent_button"
+                        kind={buttonKind}
+                        disabled={onButtonClick === null || buttonDisabledTooltip !== undefined}
+                        onClick={onButtonClick}
+                        title={buttonDisabledTooltip}
+                    >
+                        {buttonText}
+                    </AccessibleButton>
                 </div>
             </div>
-        );
-    },
-);
+        </div>
+    );
+};
 
 interface ActiveLoadedCallEventProps {
     mxEvent: MatrixEvent;
     call: ElementCall;
+    ref?: Ref<HTMLDivElement>;
 }
 
-const ActiveLoadedCallEvent = forwardRef<any, ActiveLoadedCallEventProps>(({ mxEvent, call }, ref) => {
+const ActiveLoadedCallEvent = ({ mxEvent, call, ref }: ActiveLoadedCallEventProps): JSX.Element => {
     const connectionState = useConnectionState(call);
     const participatingMembers = useParticipatingMembers(call);
     const joinCallButtonDisabledTooltip = useJoinCallButtonDisabledTooltip(call);
@@ -141,16 +150,17 @@ const ActiveLoadedCallEvent = forwardRef<any, ActiveLoadedCallEventProps>(({ mxE
             onButtonClick={onButtonClick}
         />
     );
-});
+};
 
 interface CallEventProps {
     mxEvent: MatrixEvent;
+    ref?: Ref<HTMLDivElement>;
 }
 
 /**
  * An event tile representing an active or historical Element call.
  */
-export const CallEvent = forwardRef<any, CallEventProps>(({ mxEvent }, ref) => {
+export const CallEvent = ({ mxEvent, ref }: CallEventProps): JSX.Element => {
     const client = useContext(MatrixClientContext);
     const call = useCall(mxEvent.getRoomId()!);
     const latestEvent = client
@@ -187,4 +197,4 @@ export const CallEvent = forwardRef<any, CallEventProps>(({ mxEvent }, ref) => {
     }
 
     return <ActiveLoadedCallEvent mxEvent={mxEvent} call={call as ElementCall} ref={ref} />;
-});
+};
diff --git a/src/components/views/messages/DecryptionFailureBody.tsx b/src/components/views/messages/DecryptionFailureBody.tsx
index 1158749571..f75a7c48f8 100644
--- a/src/components/views/messages/DecryptionFailureBody.tsx
+++ b/src/components/views/messages/DecryptionFailureBody.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import classNames from "classnames";
-import React, { forwardRef, type ForwardRefExoticComponent, useContext } from "react";
+import React, { type JSX, useContext } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { DecryptionFailureCode } from "matrix-js-sdk/src/crypto-api";
 import { BlockIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
@@ -16,7 +16,7 @@ import { _t } from "../../../languageHandler";
 import { type IBodyProps } from "./IBodyProps";
 import { LocalDeviceVerificationStateContext } from "../../../contexts/LocalDeviceVerificationStateContext";
 
-function getErrorMessage(mxEvent: MatrixEvent, isVerified: boolean | undefined): string | React.JSX.Element {
+function getErrorMessage(mxEvent: MatrixEvent, isVerified: boolean | undefined): string | JSX.Element {
     switch (mxEvent.decryptionFailureReason) {
         case DecryptionFailureCode.MEGOLM_KEY_WITHHELD_FOR_UNVERIFIED_DEVICE:
             return _t("timeline|decryption_failure|blocked");
@@ -72,7 +72,7 @@ function errorClassName(mxEvent: MatrixEvent): string | null {
 }
 
 // A placeholder element for messages that could not be decrypted
-export const DecryptionFailureBody = forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent }, ref): React.JSX.Element => {
+export const DecryptionFailureBody = ({ mxEvent, ref }: IBodyProps): JSX.Element => {
     const verificationState = useContext(LocalDeviceVerificationStateContext);
     const classes = classNames("mx_DecryptionFailureBody", "mx_EventTile_content", errorClassName(mxEvent));
 
@@ -81,4 +81,4 @@ export const DecryptionFailureBody = forwardRef<HTMLDivElement, IBodyProps>(({ m
             {getErrorMessage(mxEvent, verificationState)}
         </div>
     );
-}) as ForwardRefExoticComponent<IBodyProps>;
+};
diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx
index e612a5be4d..5c5f1f0dc2 100644
--- a/src/components/views/messages/EncryptionEvent.tsx
+++ b/src/components/views/messages/EncryptionEvent.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, forwardRef } from "react";
+import React, { type JSX, type Ref, type ReactNode } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import type { RoomEncryptionEventContent } from "matrix-js-sdk/src/types";
@@ -22,9 +22,10 @@ import { useIsEncrypted } from "../../../hooks/useIsEncrypted.ts";
 interface IProps {
     mxEvent: MatrixEvent;
     timestamp?: JSX.Element;
+    ref?: Ref<HTMLDivElement>;
 }
 
-const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({ mxEvent, timestamp }, ref) => {
+const EncryptionEvent = ({ mxEvent, timestamp, ref }: IProps): ReactNode => {
     const cli = useMatrixClientContext();
     const roomId = mxEvent.getRoomId()!;
     const isRoomEncrypted = useIsEncrypted(cli, cli.getRoom(roomId) || undefined);
@@ -80,6 +81,6 @@ const EncryptionEvent = forwardRef<HTMLDivElement, IProps>(({ mxEvent, timestamp
             timestamp={timestamp}
         />
     );
-});
+};
 
 export default EncryptionEvent;
diff --git a/src/components/views/messages/EventContentBody.tsx b/src/components/views/messages/EventContentBody.tsx
index 3e51691c24..fce5428e8c 100644
--- a/src/components/views/messages/EventContentBody.tsx
+++ b/src/components/views/messages/EventContentBody.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 React, { memo, forwardRef, useContext, useMemo } from "react";
+import React, { memo, useContext, useMemo, type Ref } from "react";
 import { type IContent, type MatrixEvent, MsgType, PushRuleKind } from "matrix-js-sdk/src/matrix";
 import parse from "html-react-parser";
 import { PushProcessor } from "matrix-js-sdk/src/pushprocessor";
@@ -28,6 +28,7 @@ import {
 import MatrixClientContext from "../../../contexts/MatrixClientContext.tsx";
 import { useSettingValue } from "../../../hooks/useSettings.ts";
 import { filterBoolean } from "../../../utils/arrays.ts";
+import { useMediaVisible } from "../../../hooks/useMediaVisible.ts";
 
 /**
  * Returns a RegExp pattern for the keyword in the push rule of the given Matrix event, if any
@@ -138,6 +139,7 @@ interface Props extends ReplacerOptions {
      * Whether to include the `dir="auto"` attribute on the rendered element
      */
     includeDir?: boolean;
+    ref?: Ref<HTMLElement>;
 }
 
 /**
@@ -147,50 +149,50 @@ interface Props extends ReplacerOptions {
  * Returns a div or span depending on `as`, the `dir` on a `div` is always set to `"auto"` but set by `includeDir` otherwise.
  */
 const EventContentBody = memo(
-    forwardRef<HTMLElement, Props>(
-        ({ as, mxEvent, stripReply, content, linkify, highlights, includeDir = true, ...options }, ref) => {
-            const enableBigEmoji = useSettingValue("TextualBody.enableBigEmoji");
+    ({ as, mxEvent, stripReply, content, linkify, highlights, includeDir = true, ref, ...options }: Props) => {
+        const enableBigEmoji = useSettingValue("TextualBody.enableBigEmoji");
+        const [mediaIsVisible] = useMediaVisible(mxEvent?.getId(), mxEvent?.getRoomId());
 
-            const replacer = useReplacer(content, mxEvent, options);
-            const linkifyOptions = useMemo(
-                () => ({
-                    render: replacerToRenderFunction(replacer),
+        const replacer = useReplacer(content, mxEvent, options);
+        const linkifyOptions = useMemo(
+            () => ({
+                render: replacerToRenderFunction(replacer),
+            }),
+            [replacer],
+        );
+
+        const isEmote = content.msgtype === MsgType.Emote;
+
+        const { strippedBody, formattedBody, emojiBodyElements, className } = useMemo(
+            () =>
+                bodyToNode(content, highlights, {
+                    disableBigEmoji: isEmote || !enableBigEmoji,
+                    // Part of Replies fallback support
+                    stripReplyFallback: stripReply,
+                    mediaIsVisible,
                 }),
-                [replacer],
-            );
+            [content, mediaIsVisible, enableBigEmoji, highlights, isEmote, stripReply],
+        );
 
-            const isEmote = content.msgtype === MsgType.Emote;
+        if (as === "div") includeDir = true; // force dir="auto" on divs
 
-            const { strippedBody, formattedBody, emojiBodyElements, className } = useMemo(
-                () =>
-                    bodyToNode(content, highlights, {
-                        disableBigEmoji: isEmote || !enableBigEmoji,
-                        // Part of Replies fallback support
-                        stripReplyFallback: stripReply,
-                    }),
-                [content, enableBigEmoji, highlights, isEmote, stripReply],
-            );
+        const As = as;
+        const body = formattedBody ? (
+            <As ref={ref as any} className={className} dir={includeDir ? "auto" : undefined}>
+                {parse(formattedBody, {
+                    replace: replacer,
+                })}
+            </As>
+        ) : (
+            <As ref={ref as any} className={className} dir={includeDir ? "auto" : undefined}>
+                {applyReplacerOnString(emojiBodyElements || strippedBody, replacer)}
+            </As>
+        );
 
-            if (as === "div") includeDir = true; // force dir="auto" on divs
+        if (!linkify) return body;
 
-            const As = as;
-            const body = formattedBody ? (
-                <As ref={ref as any} className={className} dir={includeDir ? "auto" : undefined}>
-                    {parse(formattedBody, {
-                        replace: replacer,
-                    })}
-                </As>
-            ) : (
-                <As ref={ref as any} className={className} dir={includeDir ? "auto" : undefined}>
-                    {applyReplacerOnString(emojiBodyElements || strippedBody, replacer)}
-                </As>
-            );
-
-            if (!linkify) return body;
-
-            return <Linkify options={linkifyOptions}>{body}</Linkify>;
-        },
-    ),
+        return <Linkify options={linkifyOptions}>{body}</Linkify>;
+    },
 );
 
 export default EventContentBody;
diff --git a/src/components/views/messages/EventTileBubble.tsx b/src/components/views/messages/EventTileBubble.tsx
index 56fbc83b86..4569115c0d 100644
--- a/src/components/views/messages/EventTileBubble.tsx
+++ b/src/components/views/messages/EventTileBubble.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, forwardRef, type ReactNode } from "react";
+import React, { type JSX, type ReactNode, type Ref } from "react";
 import classNames from "classnames";
 
 interface IProps {
@@ -15,19 +15,18 @@ interface IProps {
     timestamp?: JSX.Element;
     subtitle?: ReactNode;
     children?: JSX.Element;
+    ref?: Ref<HTMLDivElement>;
 }
 
-const EventTileBubble = forwardRef<HTMLDivElement, IProps>(
-    ({ className, title, timestamp, subtitle, children }, ref) => {
-        return (
-            <div className={classNames("mx_EventTileBubble", className)} ref={ref}>
-                <div className="mx_EventTileBubble_title">{title}</div>
-                {subtitle && <div className="mx_EventTileBubble_subtitle">{subtitle}</div>}
-                {children}
-                {timestamp}
-            </div>
-        );
-    },
-);
+const EventTileBubble = ({ className, title, timestamp, subtitle, children, ref }: IProps): JSX.Element => {
+    return (
+        <div className={classNames("mx_EventTileBubble", className)} ref={ref}>
+            <div className="mx_EventTileBubble_title">{title}</div>
+            {subtitle && <div className="mx_EventTileBubble_subtitle">{subtitle}</div>}
+            {children}
+            {timestamp}
+        </div>
+    );
+};
 
 export default EventTileBubble;
diff --git a/src/components/views/messages/HiddenBody.tsx b/src/components/views/messages/HiddenBody.tsx
index 9cabbe43dc..20410017be 100644
--- a/src/components/views/messages/HiddenBody.tsx
+++ b/src/components/views/messages/HiddenBody.tsx
@@ -6,23 +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 from "react";
-import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
+import React, { type JSX } from "react";
 
 import { _t } from "../../../languageHandler";
 import { type IBodyProps } from "./IBodyProps";
 
-interface IProps {
-    mxEvent: MatrixEvent;
-}
-
 /**
  * A message hidden from the user pending moderation.
  *
  * Note: This component must not be used when the user is the author of the message
  * or has a sufficient powerlevel to see the message.
  */
-const HiddenBody = React.forwardRef<any, IProps | IBodyProps>(({ mxEvent }, ref) => {
+const HiddenBody = ({ mxEvent, ref }: IBodyProps): JSX.Element => {
     let text;
     const visibility = mxEvent.messageVisibility();
     switch (visibility.visible) {
@@ -42,6 +37,6 @@ const HiddenBody = React.forwardRef<any, IProps | IBodyProps>(({ mxEvent }, ref)
             {text}
         </span>
     );
-});
+};
 
 export default HiddenBody;
diff --git a/src/components/views/messages/HideActionButton.tsx b/src/components/views/messages/HideActionButton.tsx
index 8d2baf0220..0c9817b2a6 100644
--- a/src/components/views/messages/HideActionButton.tsx
+++ b/src/components/views/messages/HideActionButton.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 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
@@ -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()!);
+    const [mediaIsVisible, setVisible] = useMediaVisible(mxEvent.getId(), mxEvent.getRoomId());
 
     if (!mediaIsVisible) {
         return;
diff --git a/src/components/views/messages/IBodyProps.ts b/src/components/views/messages/IBodyProps.ts
index 59f5030c75..37aae37de6 100644
--- a/src/components/views/messages/IBodyProps.ts
+++ b/src/components/views/messages/IBodyProps.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 LegacyRef } from "react";
 import { type MatrixEvent } from "matrix-js-sdk/src/matrix";
 
 import type React from "react";
@@ -44,7 +43,7 @@ export interface IBodyProps {
     // helper function to access relations for this event
     getRelationsForEvent?: GetRelationsForEvent;
 
-    ref?: React.RefObject<any> | LegacyRef<any>;
+    ref?: React.RefObject<any>;
 
     // 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.
diff --git a/src/components/views/messages/MBeaconBody.tsx b/src/components/views/messages/MBeaconBody.tsx
index 0b9528db50..48294296be 100644
--- a/src/components/views/messages/MBeaconBody.tsx
+++ b/src/components/views/messages/MBeaconBody.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 ForwardRefExoticComponent, useCallback, useContext, useEffect, useState } from "react";
+import React, { type JSX, useCallback, useContext, useEffect, useState } from "react";
 import {
     type Beacon,
     BeaconEvent,
@@ -122,7 +122,7 @@ const useHandleBeaconRedaction = (
     }, [event, onBeforeBeaconInfoRedaction]);
 };
 
-const MBeaconBody = React.forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent, getRelationsForEvent }, ref) => {
+const MBeaconBody = ({ mxEvent, getRelationsForEvent, ref }: IBodyProps): JSX.Element => {
     const { beacon, isLive, latestLocationState, waitingToStart } = useBeaconState(mxEvent);
     const mapId = useUniqueId(mxEvent.getId()!);
 
@@ -225,6 +225,6 @@ const MBeaconBody = React.forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent, get
             )}
         </div>
     );
-}) as ForwardRefExoticComponent<IBodyProps>;
+};
 
 export default MBeaconBody;
diff --git a/src/components/views/messages/MImageBody.tsx b/src/components/views/messages/MImageBody.tsx
index 7c42ea4462..79f840ce39 100644
--- a/src/components/views/messages/MImageBody.tsx
+++ b/src/components/views/messages/MImageBody.tsx
@@ -686,7 +686,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()!);
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
     return <MImageBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MImageReplyBody.tsx b/src/components/views/messages/MImageReplyBody.tsx
index 788ca2d7e9..b73f8f77c3 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()!);
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
     return <MImageReplyBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MPollEndBody.tsx b/src/components/views/messages/MPollEndBody.tsx
index a3a42a7843..95f8a53f2a 100644
--- a/src/components/views/messages/MPollEndBody.tsx
+++ b/src/components/views/messages/MPollEndBody.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, { useEffect, useState, useContext, type ForwardRefExoticComponent } from "react";
+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";
 
@@ -85,7 +85,7 @@ const usePollStartEvent = (event: MatrixEvent): { pollStartEvent?: MatrixEvent;
     return { pollStartEvent, isLoadingPollStartEvent };
 };
 
-export const MPollEndBody = React.forwardRef<any, IBodyProps>(({ mxEvent, ...props }, ref) => {
+export const MPollEndBody = ({ mxEvent, ref, ...props }: IBodyProps): JSX.Element => {
     const cli = useMatrixClientContext();
     const { pollStartEvent, isLoadingPollStartEvent } = usePollStartEvent(mxEvent);
 
@@ -105,4 +105,4 @@ export const MPollEndBody = React.forwardRef<any, IBodyProps>(({ mxEvent, ...pro
             <MPollBody mxEvent={pollStartEvent} {...props} />
         </div>
     );
-}) as ForwardRefExoticComponent<IBodyProps>;
+};
diff --git a/src/components/views/messages/MStickerBody.tsx b/src/components/views/messages/MStickerBody.tsx
index 365ebc652a..3a922d35aa 100644
--- a/src/components/views/messages/MStickerBody.tsx
+++ b/src/components/views/messages/MStickerBody.tsx
@@ -79,7 +79,7 @@ class MStickerBodyInner extends MImageBodyInner {
 }
 
 const MStickerBody: React.FC<IBodyProps> = (props) => {
-    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId()!);
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
     return <MStickerBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/MVideoBody.tsx b/src/components/views/messages/MVideoBody.tsx
index 58ba7575fe..6a36dae6a8 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()!);
+    const [mediaVisible, setVisible] = useMediaVisible(props.mxEvent.getId(), props.mxEvent.getRoomId());
     return <MVideoBodyInner mediaVisible={mediaVisible} setMediaVisible={setVisible} {...props} />;
 };
 
diff --git a/src/components/views/messages/RedactedBody.tsx b/src/components/views/messages/RedactedBody.tsx
index 9048d176ca..ddad4d2e4d 100644
--- a/src/components/views/messages/RedactedBody.tsx
+++ b/src/components/views/messages/RedactedBody.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 ForwardRefExoticComponent, useContext } from "react";
+import React, { useContext, type JSX } from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
@@ -15,7 +15,7 @@ import { formatFullDate } from "../../../DateUtils";
 import SettingsStore from "../../../settings/SettingsStore";
 import { type IBodyProps } from "./IBodyProps";
 
-const RedactedBody = React.forwardRef<any, IBodyProps>(({ mxEvent }, ref) => {
+const RedactedBody = ({ mxEvent, ref }: IBodyProps): JSX.Element => {
     const cli: MatrixClient = useContext(MatrixClientContext);
     let text = _t("timeline|self_redaction");
     const unsigned = mxEvent.getUnsigned();
@@ -37,6 +37,6 @@ const RedactedBody = React.forwardRef<any, IBodyProps>(({ mxEvent }, ref) => {
             {text}
         </span>
     );
-}) as ForwardRefExoticComponent<IBodyProps>;
+};
 
 export default RedactedBody;
diff --git a/src/components/views/messages/RoomAvatarEvent.tsx b/src/components/views/messages/RoomAvatarEvent.tsx
index 7c155e59d6..c80c80c836 100644
--- a/src/components/views/messages/RoomAvatarEvent.tsx
+++ b/src/components/views/messages/RoomAvatarEvent.tsx
@@ -70,7 +70,7 @@ export default class RoomAvatarEvent extends React.Component<IProps> {
                                 className="mx_RoomAvatarEvent_avatar"
                                 onClick={this.onAvatarClick}
                             >
-                                <RoomAvatar size="14px" oobData={oobData} />
+                                <RoomAvatar room={room ?? undefined} size="14px" oobData={oobData} />
                             </AccessibleButton>
                         ),
                     },
diff --git a/src/components/views/messages/TextualBody.tsx b/src/components/views/messages/TextualBody.tsx
index b51d2fa3f3..d0107b31ec 100644
--- a/src/components/views/messages/TextualBody.tsx
+++ b/src/components/views/messages/TextualBody.tsx
@@ -235,7 +235,7 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
         scalarClient?.connect().then(() => {
             const completeUrl = scalarClient.getStarterLink(starterLink);
             const integrationsUrl = integrationManager!.uiUrl;
-            Modal.createDialog(QuestionDialog, {
+            const { finished } = Modal.createDialog(QuestionDialog, {
                 title: _t("timeline|scalar_starter_link|dialog_title"),
                 description: (
                     <div>
@@ -243,18 +243,19 @@ export default class TextualBody extends React.Component<IBodyProps, IState> {
                     </div>
                 ),
                 button: _t("action|continue"),
-                onFinished(confirmed) {
-                    if (!confirmed) {
-                        return;
-                    }
-                    const width = window.screen.width > 1024 ? 1024 : window.screen.width;
-                    const height = window.screen.height > 800 ? 800 : window.screen.height;
-                    const left = (window.screen.width - width) / 2;
-                    const top = (window.screen.height - height) / 2;
-                    const features = `height=${height}, width=${width}, top=${top}, left=${left},`;
-                    const wnd = window.open(completeUrl, "_blank", features)!;
-                    wnd.opener = null;
-                },
+            });
+
+            finished.then(([confirmed]) => {
+                if (!confirmed) {
+                    return;
+                }
+                const width = window.screen.width > 1024 ? 1024 : window.screen.width;
+                const height = window.screen.height > 800 ? 800 : window.screen.height;
+                const left = (window.screen.width - width) / 2;
+                const top = (window.screen.height - height) / 2;
+                const features = `height=${height}, width=${width}, top=${top}, left=${left},`;
+                const wnd = window.open(completeUrl, "_blank", features)!;
+                wnd.opener = null;
             });
         });
     };
diff --git a/src/components/views/messages/UnknownBody.tsx b/src/components/views/messages/UnknownBody.tsx
index e72f8d2327..26e4ea5fca 100644
--- a/src/components/views/messages/UnknownBody.tsx
+++ b/src/components/views/messages/UnknownBody.tsx
@@ -7,16 +7,15 @@ 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, { forwardRef, type ForwardRefExoticComponent } from "react";
+import React, { type JSX } from "react";
 
 import { type IBodyProps } from "./IBodyProps";
 
-export default forwardRef<HTMLDivElement, IBodyProps>(({ mxEvent, children }, ref) => {
+export default ({ mxEvent, ref }: IBodyProps): JSX.Element => {
     const text = mxEvent.getContent().body;
     return (
         <div className="mx_UnknownBody" ref={ref}>
             {text}
-            {children}
         </div>
     );
-}) as ForwardRefExoticComponent<IBodyProps>;
+};
diff --git a/src/components/views/right_panel/BaseCard.tsx b/src/components/views/right_panel/BaseCard.tsx
index 90534947a0..a564a60695 100644
--- a/src/components/views/right_panel/BaseCard.tsx
+++ b/src/components/views/right_panel/BaseCard.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, { forwardRef, type ReactNode, type KeyboardEvent, type Ref, type MouseEvent } from "react";
+import React, { type ReactNode, type KeyboardEvent, type Ref, type MouseEvent } from "react";
 import classNames from "classnames";
 import { IconButton, Text } from "@vector-im/compound-web";
 import CloseIcon from "@vector-im/compound-design-tokens/assets/web/icons/close";
@@ -44,106 +44,102 @@ function closeRightPanel(ev: MouseEvent<HTMLButtonElement>): void {
     RightPanelStore.instance.popCard();
 }
 
-const BaseCard: React.FC<IProps> = forwardRef<HTMLDivElement, IProps>(
-    (
-        {
-            closeLabel,
-            onClose,
-            onBack,
-            className,
-            id,
-            ariaLabelledBy,
-            role,
-            hideHeaderButtons,
-            header,
-            footer,
-            withoutScrollContainer,
-            children,
-            onKeyDown,
-            closeButtonRef,
-        },
-        ref,
-    ) => {
-        let backButton;
-        const cardHistory = RightPanelStore.instance.roomPhaseHistory;
-        if (cardHistory.length > 1 && !hideHeaderButtons) {
-            const prevCard = cardHistory[cardHistory.length - 2];
-            const onBackClick = (ev: MouseEvent<HTMLButtonElement>): void => {
-                onBack?.(ev);
-                RightPanelStore.instance.popCard();
-            };
-            const label = backLabelForPhase(prevCard.phase) ?? _t("action|back");
-            backButton = (
-                <IconButton
-                    size="28px"
-                    data-testid="base-card-back-button"
-                    onClick={onBackClick}
-                    tooltip={label}
-                    subtleBackground
-                >
-                    <ChevronLeftIcon />
-                </IconButton>
-            );
-        }
-
-        let closeButton;
-        if (!hideHeaderButtons) {
-            closeButton = (
-                <IconButton
-                    size="28px"
-                    data-testid="base-card-close-button"
-                    onClick={onClose ?? closeRightPanel}
-                    ref={closeButtonRef}
-                    tooltip={closeLabel ?? _t("action|close")}
-                    subtleBackground
-                >
-                    <CloseIcon />
-                </IconButton>
-            );
-        }
-
-        if (!withoutScrollContainer) {
-            children = <AutoHideScrollbar>{children}</AutoHideScrollbar>;
-        }
-
-        const shouldRenderHeader = header || !hideHeaderButtons;
-
-        return (
-            <CardContext.Provider value={{ isCard: true }}>
-                <div
-                    id={id}
-                    aria-labelledby={ariaLabelledBy}
-                    role={role}
-                    className={classNames("mx_BaseCard", className)}
-                    ref={ref}
-                    onKeyDown={onKeyDown}
-                >
-                    {shouldRenderHeader && (
-                        <div className="mx_BaseCard_header">
-                            {backButton}
-                            {typeof header === "string" ? (
-                                <div className="mx_BaseCard_header_title">
-                                    <Text
-                                        size="md"
-                                        weight="medium"
-                                        className="mx_BaseCard_header_title_heading"
-                                        role="heading"
-                                    >
-                                        {header}
-                                    </Text>
-                                </div>
-                            ) : (
-                                (header ?? <div className="mx_BaseCard_header_spacer" />)
-                            )}
-                            {closeButton}
-                        </div>
-                    )}
-                    {children}
-                    {footer && <div className="mx_BaseCard_footer">{footer}</div>}
-                </div>
-            </CardContext.Provider>
+const BaseCard: React.FC<IProps> = ({
+    closeLabel,
+    onClose,
+    onBack,
+    className,
+    id,
+    ariaLabelledBy,
+    role,
+    hideHeaderButtons,
+    header,
+    footer,
+    withoutScrollContainer,
+    children,
+    onKeyDown,
+    closeButtonRef,
+    ref,
+}: IProps) => {
+    let backButton;
+    const cardHistory = RightPanelStore.instance.roomPhaseHistory;
+    if (cardHistory.length > 1 && !hideHeaderButtons) {
+        const prevCard = cardHistory[cardHistory.length - 2];
+        const onBackClick = (ev: MouseEvent<HTMLButtonElement>): void => {
+            onBack?.(ev);
+            RightPanelStore.instance.popCard();
+        };
+        const label = backLabelForPhase(prevCard.phase) ?? _t("action|back");
+        backButton = (
+            <IconButton
+                size="28px"
+                data-testid="base-card-back-button"
+                onClick={onBackClick}
+                tooltip={label}
+                subtleBackground
+            >
+                <ChevronLeftIcon />
+            </IconButton>
         );
-    },
-);
+    }
+
+    let closeButton;
+    if (!hideHeaderButtons) {
+        closeButton = (
+            <IconButton
+                size="28px"
+                data-testid="base-card-close-button"
+                onClick={onClose ?? closeRightPanel}
+                ref={closeButtonRef}
+                tooltip={closeLabel ?? _t("action|close")}
+                subtleBackground
+            >
+                <CloseIcon />
+            </IconButton>
+        );
+    }
+
+    if (!withoutScrollContainer) {
+        children = <AutoHideScrollbar>{children}</AutoHideScrollbar>;
+    }
+
+    const shouldRenderHeader = header || !hideHeaderButtons;
+
+    return (
+        <CardContext.Provider value={{ isCard: true }}>
+            <div
+                id={id}
+                aria-labelledby={ariaLabelledBy}
+                role={role}
+                className={classNames("mx_BaseCard", className)}
+                ref={ref}
+                onKeyDown={onKeyDown}
+            >
+                {shouldRenderHeader && (
+                    <div className="mx_BaseCard_header">
+                        {backButton}
+                        {typeof header === "string" ? (
+                            <div className="mx_BaseCard_header_title">
+                                <Text
+                                    size="md"
+                                    weight="medium"
+                                    className="mx_BaseCard_header_title_heading"
+                                    role="heading"
+                                >
+                                    {header}
+                                </Text>
+                            </div>
+                        ) : (
+                            (header ?? <div className="mx_BaseCard_header_spacer" />)
+                        )}
+                        {closeButton}
+                    </div>
+                )}
+                {children}
+                {footer && <div className="mx_BaseCard_footer">{footer}</div>}
+            </div>
+        </CardContext.Provider>
+    );
+};
 
 export default BaseCard;
diff --git a/src/components/views/right_panel/RoomSummaryCard.tsx b/src/components/views/right_panel/RoomSummaryCardView.tsx
similarity index 50%
rename from src/components/views/right_panel/RoomSummaryCard.tsx
rename to src/components/views/right_panel/RoomSummaryCardView.tsx
index cbf5c73bca..d994e697c6 100644
--- a/src/components/views/right_panel/RoomSummaryCard.tsx
+++ b/src/components/views/right_panel/RoomSummaryCardView.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 ChangeEvent, type SyntheticEvent, useContext, useEffect, useRef, useState } from "react";
+import React, { useEffect, useState, type JSX } from "react";
 import classNames from "classnames";
 import {
     MenuItem,
@@ -38,98 +38,36 @@ import PublicIcon from "@vector-im/compound-design-tokens/assets/web/icons/publi
 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 { EventType, JoinRule, type Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import { JoinRule, type Room } from "matrix-js-sdk/src/matrix";
 
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { useIsEncrypted } from "../../../hooks/useIsEncrypted";
-import BaseCard from "./BaseCard";
-import { _t } from "../../../languageHandler";
-import RoomAvatar from "../avatars/RoomAvatar";
-import defaultDispatcher from "../../../dispatcher/dispatcher";
-import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
-import Modal from "../../../Modal";
-import { ShareDialog } from "../dialogs/ShareDialog";
-import { useEventEmitterState } from "../../../hooks/useEventEmitter";
-import { E2EStatus } from "../../../utils/ShieldUtils";
-import { type RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
-import { TimelineRenderingType } from "../../../contexts/RoomContext";
-import RoomName from "../elements/RoomName";
-import ExportDialog from "../dialogs/ExportDialog";
-import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
-import PosthogTrackers from "../../../PosthogTrackers";
-import { PollHistoryDialog } from "../dialogs/PollHistoryDialog";
-import { Flex } from "../../utils/Flex";
-import RoomListStore, { LISTS_UPDATE_EVENT } from "../../../stores/room-list/RoomListStore";
-import { DefaultTagID } from "../../../stores/room-list/models";
-import { tagRoom } from "../../../utils/room/tagRoom";
-import { canInviteTo } from "../../../utils/room/canInviteTo";
-import { inviteToRoom } from "../../../utils/room/inviteToRoom";
-import { useAccountData } from "../../../hooks/useAccountData";
-import { useRoomState } from "../../../hooks/useRoomState";
-import { useTopic } from "../../../hooks/room/useTopic";
-import { Linkify, topicToHtml } from "../../../HtmlUtils";
-import { Box } from "../../utils/Box";
-import { onRoomTopicLinkClick } from "../elements/RoomTopic";
-import { useDispatcher } from "../../../hooks/useDispatcher";
-import { Action } from "../../../dispatcher/actions";
-import { Key } from "../../../Keyboard";
-import { useTransition } from "../../../hooks/useTransition";
-import { isVideoRoom as calcIsVideoRoom } from "../../../utils/video-rooms";
-import { usePinnedEvents } from "../../../hooks/usePinnedEvents";
+import BaseCard from "./BaseCard.tsx";
+import { _t } from "../../../languageHandler.tsx";
+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 { useScopedRoomContext } from "../../../contexts/ScopedRoomContext.tsx";
-import { ReportRoomDialog } from "../dialogs/ReportRoomDialog.tsx";
+import { useRoomSummaryCardViewModel } from "../../viewmodels/right_panel/RoomSummaryCardViewModel.tsx";
+import { useRoomTopicViewModel } from "../../viewmodels/right_panel/RoomSummaryCardTopicViewModel.tsx";
 
 interface IProps {
     room: Room;
     permalinkCreator: RoomPermalinkCreator;
-    onSearchChange?: (e: ChangeEvent) => void;
+    onSearchChange?: (term: string) => void;
     onSearchCancel?: () => void;
     focusRoomSearch?: boolean;
+    searchTerm?: string;
 }
 
-const onRoomMembersClick = (): void => {
-    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.MemberList }, true);
-};
-
-const onRoomThreadsClick = (): void => {
-    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.ThreadPanel }, true);
-};
-
-const onRoomFilesClick = (): void => {
-    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.FilePanel }, true);
-};
-
-const onRoomExtensionsClick = (): void => {
-    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.Extensions }, true);
-};
-
-const onRoomPinsClick = (): void => {
-    PosthogTrackers.trackInteraction("PinnedMessageRoomInfoButton");
-    RightPanelStore.instance.pushCard({ phase: RightPanelPhases.PinnedMessages }, true);
-};
-
-const onRoomSettingsClick = (ev: Event): void => {
-    defaultDispatcher.dispatch({ action: "open_room_settings" });
-    PosthogTrackers.trackInteraction("WebRightPanelRoomInfoSettingsButton", ev);
-};
-
 const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null => {
-    const [expanded, setExpanded] = useState(true);
+    const vm = useRoomTopicViewModel(room);
 
-    const topic = useTopic(room);
-    const body = topicToHtml(topic?.text, topic?.html);
+    const body = topicToHtml(vm.topic?.text, vm.topic?.html);
 
-    const canEditTopic = useRoomState(room, (state) =>
-        state.maySendStateEvent(EventType.RoomTopic, room.client.getSafeUserId()),
-    );
-    const onEditClick = (e: SyntheticEvent): void => {
-        e.preventDefault();
-        e.stopPropagation();
-        defaultDispatcher.dispatch({ action: "open_room_settings" });
-    };
-
-    if (!body && !canEditTopic) {
+    if (!body && !vm.canEditTopic) {
         return null;
     }
 
@@ -143,7 +81,7 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
                 className="mx_RoomSummaryCard_topic"
             >
                 <Box flex="1">
-                    <Link kind="primary" onClick={onEditClick}>
+                    <Link kind="primary" onClick={vm.onEditClick}>
                         <Text size="sm" weight="regular">
                             {_t("right_panel|add_topic")}
                         </Text>
@@ -153,7 +91,8 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
         );
     }
 
-    const content = expanded ? <Linkify>{body}</Linkify> : body;
+    const content = vm.expanded ? <Linkify>{body}</Linkify> : body;
+
     return (
         <Flex
             as="section"
@@ -161,33 +100,20 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
             justify="center"
             gap="var(--cpd-space-2x)"
             className={classNames("mx_RoomSummaryCard_topic", {
-                mx_RoomSummaryCard_topic_collapsed: !expanded,
+                mx_RoomSummaryCard_topic_collapsed: !vm.expanded,
             })}
         >
             <Box flex="1" className="mx_RoomSummaryCard_topic_container">
-                <Text
-                    size="sm"
-                    weight="regular"
-                    onClick={(ev: React.MouseEvent): void => {
-                        if (ev.target instanceof HTMLAnchorElement) {
-                            onRoomTopicLinkClick(ev);
-                            return;
-                        }
-                    }}
-                >
+                <Text size="sm" weight="regular" onClick={vm.onTopicLinkClick}>
                     {content}
                 </Text>
-                <IconButton
-                    className="mx_RoomSummaryCard_topic_chevron"
-                    size="24px"
-                    onClick={() => setExpanded(!expanded)}
-                >
+                <IconButton className="mx_RoomSummaryCard_topic_chevron" size="24px" onClick={vm.onExpandedClick}>
                     <ChevronDownIcon />
                 </IconButton>
             </Box>
-            {expanded && canEditTopic && (
+            {vm.expanded && vm.canEditTopic && (
                 <Box flex="1" className="mx_RoomSummaryCard_topic_edit">
-                    <Link kind="primary" onClick={onEditClick}>
+                    <Link kind="primary" onClick={vm.onEditClick}>
                         <Text size="sm" weight="regular">
                             {_t("action|edit")}
                         </Text>
@@ -198,85 +124,23 @@ const RoomTopic: React.FC<Pick<IProps, "room">> = ({ room }): JSX.Element | null
     );
 };
 
-const RoomSummaryCard: React.FC<IProps> = ({
+const RoomSummaryCardView: React.FC<IProps> = ({
     room,
     permalinkCreator,
     onSearchChange,
     onSearchCancel,
     focusRoomSearch,
+    searchTerm = "",
 }) => {
-    const cli = useContext(MatrixClientContext);
+    const vm = useRoomSummaryCardViewModel(room, permalinkCreator, onSearchCancel);
 
-    const onShareRoomClick = (): void => {
-        Modal.createDialog(ShareDialog, {
-            target: room,
-        });
-    };
-
-    const onRoomExportClick = async (): Promise<void> => {
-        Modal.createDialog(ExportDialog, {
-            room,
-        });
-    };
-
-    const onRoomPollHistoryClick = (): void => {
-        Modal.createDialog(PollHistoryDialog, {
-            room,
-            matrixClient: cli,
-            permalinkCreator,
-        });
-    };
-
-    const onLeaveRoomClick = (): void => {
-        defaultDispatcher.dispatch({
-            action: "leave_room",
-            room_id: room.roomId,
-        });
-    };
-    const onReportRoomClick = (): void => {
-        Modal.createDialog(ReportRoomDialog, {
-            roomId: room.roomId,
-        });
-    };
-
-    const isRoomEncrypted = useIsEncrypted(cli, room);
-    const roomContext = useScopedRoomContext("e2eStatus", "timelineRenderingType");
-    const e2eStatus = roomContext.e2eStatus;
-    const isVideoRoom = calcIsVideoRoom(room);
-
-    const roomState = useRoomState(room);
-    const directRoomsList = useAccountData<Record<string, string[]>>(room.client, EventType.Direct);
-    const [isDirectMessage, setDirectMessage] = useState(false);
+    // The search field is controlled and onSearchChange is debounced in RoomView,
+    // so we need to set the value of the input right away
+    const [searchValue, setSearchValue] = useState(searchTerm);
     useEffect(() => {
-        for (const [, dmRoomList] of Object.entries(directRoomsList)) {
-            if (dmRoomList.includes(room?.roomId ?? "")) {
-                setDirectMessage(true);
-                break;
-            }
-        }
-    }, [room, directRoomsList]);
+        setSearchValue(searchTerm);
+    }, [searchTerm]);
 
-    const searchInputRef = useRef<HTMLInputElement>(null);
-    useDispatcher(defaultDispatcher, (payload) => {
-        if (payload.action === Action.FocusMessageSearch) {
-            searchInputRef.current?.focus();
-        }
-    });
-    // Clear the search field when the user leaves the search view
-    useTransition(
-        (prevTimelineRenderingType) => {
-            if (
-                prevTimelineRenderingType === TimelineRenderingType.Search &&
-                roomContext.timelineRenderingType !== TimelineRenderingType.Search &&
-                searchInputRef.current
-            ) {
-                searchInputRef.current.value = "";
-            }
-        },
-        [roomContext.timelineRenderingType],
-    );
-
-    const alias = room.getCanonicalAlias() || room.getAltAliases()[0] || "";
     const roomInfo = (
         <header className="mx_RoomSummaryCard_container">
             <RoomAvatar room={room} size="80px" viewAvatarOnClick />
@@ -298,34 +162,34 @@ const RoomSummaryCard: React.FC<IProps> = ({
                 size="sm"
                 weight="semibold"
                 className="mx_RoomSummaryCard_alias text-secondary"
-                title={alias}
+                title={vm.alias}
             >
-                {alias}
+                {vm.alias}
             </Text>
 
             <Flex as="section" justify="center" gap="var(--cpd-space-2x)" className="mx_RoomSummaryCard_badges">
-                {!isDirectMessage && roomState.getJoinRule() === JoinRule.Public && (
+                {!vm.isDirectMessage && vm.roomJoinRule === JoinRule.Public && (
                     <Badge kind="grey">
                         <PublicIcon width="1em" />
                         {_t("common|public_room")}
                     </Badge>
                 )}
 
-                {isRoomEncrypted && e2eStatus !== E2EStatus.Warning && (
+                {vm.isRoomEncrypted && vm.e2eStatus !== E2EStatus.Warning && (
                     <Badge kind="green">
                         <LockIcon width="1em" />
                         {_t("common|encrypted")}
                     </Badge>
                 )}
 
-                {!e2eStatus && (
+                {!vm.isRoomEncrypted && (
                     <Badge kind="grey">
                         <LockOffIcon width="1em" />
                         {_t("common|unencrypted")}
                     </Badge>
                 )}
 
-                {e2eStatus === E2EStatus.Warning && (
+                {vm.e2eStatus === E2EStatus.Warning && (
                     <Badge kind="red">
                         <ErrorSolidIcon width="1em" />
                         {_t("common|not_trusted")}
@@ -337,29 +201,20 @@ const RoomSummaryCard: React.FC<IProps> = ({
         </header>
     );
 
-    const pinCount = usePinnedEvents(room).length;
-
-    const roomTags = useEventEmitterState(RoomListStore.instance, LISTS_UPDATE_EVENT, () =>
-        RoomListStore.instance.getTagsForRoom(room),
-    );
-    const canInviteToState = useEventEmitterState(room, RoomStateEvent.Update, () => canInviteTo(room));
-    const isFavorite = roomTags.includes(DefaultTagID.Favourite);
-
     const header = onSearchChange && (
         <Form.Root className="mx_RoomSummaryCard_search" onSubmit={(e) => e.preventDefault()}>
             <Search
                 placeholder={_t("room|search|placeholder")}
                 name="room_message_search"
-                onChange={onSearchChange}
-                className="mx_no_textinput"
-                ref={searchInputRef}
-                autoFocus={focusRoomSearch}
-                onKeyDown={(e) => {
-                    if (searchInputRef.current && e.key === Key.ESCAPE) {
-                        searchInputRef.current.value = "";
-                        onSearchCancel?.();
-                    }
+                onChange={(e) => {
+                    setSearchValue(e.currentTarget.value);
+                    onSearchChange(e.currentTarget.value);
                 }}
+                value={searchValue}
+                className="mx_no_textinput"
+                ref={vm.searchInputRef}
+                autoFocus={focusRoomSearch}
+                onKeyDown={vm.onUpdateSearchInput}
             />
         </Form.Root>
     );
@@ -380,21 +235,21 @@ const RoomSummaryCard: React.FC<IProps> = ({
                 <ToggleMenuItem
                     Icon={FavouriteIcon}
                     label={_t("room|context_menu|favourite")}
-                    checked={isFavorite}
-                    onSelect={() => tagRoom(room, DefaultTagID.Favourite)}
+                    checked={vm.isFavorite}
+                    onSelect={vm.onFavoriteToggleClick}
                 />
                 <MenuItem
                     Icon={UserAddIcon}
                     label={_t("action|invite")}
-                    disabled={!canInviteToState}
-                    onSelect={() => inviteToRoom(room)}
+                    disabled={!vm.canInviteToState}
+                    onSelect={vm.onInviteToRoomClick}
                 />
 
                 <Separator />
 
-                <MenuItem Icon={UserProfileIcon} label={_t("common|people")} onSelect={onRoomMembersClick} />
-                <MenuItem Icon={ThreadsIcon} label={_t("common|threads")} onSelect={onRoomThreadsClick} />
-                {!isVideoRoom && (
+                <MenuItem Icon={UserProfileIcon} label={_t("common|people")} onSelect={vm.onRoomMembersClick} />
+                <MenuItem Icon={ThreadsIcon} label={_t("common|threads")} onSelect={vm.onRoomThreadsClick} />
+                {!vm.isVideoRoom && (
                     <>
                         <ReleaseAnnouncement
                             feature="pinningMessageList"
@@ -407,58 +262,62 @@ const RoomSummaryCard: React.FC<IProps> = ({
                                 <MenuItem
                                     Icon={PinIcon}
                                     label={_t("right_panel|pinned_messages_button")}
-                                    onSelect={onRoomPinsClick}
+                                    onSelect={vm.onRoomPinsClick}
                                 >
                                     <Text as="span" size="sm">
-                                        {pinCount}
+                                        {vm.pinCount}
                                     </Text>
                                 </MenuItem>
                             </div>
                         </ReleaseAnnouncement>
-                        <MenuItem Icon={FilesIcon} label={_t("right_panel|files_button")} onSelect={onRoomFilesClick} />
+                        <MenuItem
+                            Icon={FilesIcon}
+                            label={_t("right_panel|files_button")}
+                            onSelect={vm.onRoomFilesClick}
+                        />
                         <MenuItem
                             Icon={ExtensionsIcon}
                             label={_t("right_panel|extensions_button")}
-                            onSelect={onRoomExtensionsClick}
+                            onSelect={vm.onRoomExtensionsClick}
                         />
                     </>
                 )}
 
                 <Separator />
 
-                <MenuItem Icon={LinkIcon} label={_t("action|copy_link")} onSelect={onShareRoomClick} />
+                <MenuItem Icon={LinkIcon} label={_t("action|copy_link")} onSelect={vm.onShareRoomClick} />
 
-                {!isVideoRoom && (
+                {!vm.isVideoRoom && (
                     <>
                         <MenuItem
                             Icon={PollsIcon}
                             label={_t("right_panel|polls_button")}
-                            onSelect={onRoomPollHistoryClick}
+                            onSelect={vm.onRoomPollHistoryClick}
                         />
                         <MenuItem
                             Icon={ExportArchiveIcon}
                             label={_t("export_chat|title")}
-                            onSelect={onRoomExportClick}
+                            onSelect={vm.onRoomExportClick}
                         />
                     </>
                 )}
 
-                <MenuItem Icon={SettingsIcon} label={_t("common|settings")} onSelect={onRoomSettingsClick} />
+                <MenuItem Icon={SettingsIcon} label={_t("common|settings")} onSelect={vm.onRoomSettingsClick} />
 
                 <Separator />
                 <div className="mx_RoomSummaryCard_bottomOptions">
+                    <MenuItem
+                        Icon={ErrorIcon}
+                        kind="critical"
+                        label={_t("action|report_room")}
+                        onSelect={vm.onReportRoomClick}
+                    />
                     <MenuItem
                         className="mx_RoomSummaryCard_leave"
                         Icon={LeaveIcon}
                         kind="critical"
                         label={_t("action|leave_room")}
-                        onSelect={onLeaveRoomClick}
-                    />
-                    <MenuItem
-                        Icon={ErrorIcon}
-                        kind="critical"
-                        label={_t("action|report_room")}
-                        onSelect={onReportRoomClick}
+                        onSelect={vm.onLeaveRoomClick}
                     />
                 </div>
             </div>
@@ -466,4 +325,4 @@ const RoomSummaryCard: React.FC<IProps> = ({
     );
 };
 
-export default RoomSummaryCard;
+export default RoomSummaryCardView;
diff --git a/src/components/views/room_settings/AliasSettings.tsx b/src/components/views/room_settings/AliasSettings.tsx
index 5c9792a296..c7efbb6166 100644
--- a/src/components/views/room_settings/AliasSettings.tsx
+++ b/src/components/views/room_settings/AliasSettings.tsx
@@ -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 React, { type JSX, type ChangeEvent, type ContextType, createRef, type SyntheticEvent } from "react";
+import React, {
+    type JSX,
+    type ToggleEvent,
+    type ChangeEvent,
+    type ContextType,
+    createRef,
+    type SyntheticEvent,
+} from "react";
 import { type MatrixEvent, EventType } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type RoomCanonicalAliasEventContent } from "matrix-js-sdk/src/types";
@@ -278,7 +285,7 @@ export default class AliasSettings extends React.Component<IProps, IState> {
             });
     };
 
-    private onLocalAliasesToggled = (event: ChangeEvent<HTMLDetailsElement>): void => {
+    private onLocalAliasesToggled = (event: ToggleEvent<HTMLDetailsElement>): void => {
         // expanded
         if (event.currentTarget.open) {
             // if local aliases haven't been preloaded yet at component mount
diff --git a/src/components/views/room_settings/RoomProfileSettings.tsx b/src/components/views/room_settings/RoomProfileSettings.tsx
index 26cd16e873..e7674a109a 100644
--- a/src/components/views/room_settings/RoomProfileSettings.tsx
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React, { createRef } from "react";
 import classNames from "classnames";
-import { ContentHelpers, EventType } from "matrix-js-sdk/src/matrix";
+import { ContentHelpers, EventType, type Room } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -15,7 +15,8 @@ import Field from "../elements/Field";
 import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton";
 import AvatarSetting from "../settings/AvatarSetting";
 import { htmlSerializeFromMdIfNeeded } from "../../../editor/serialize";
-import { idNameForRoom } from "../avatars/RoomAvatar";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import { LocalRoom } from "../../../models/LocalRoom";
 
 interface IProps {
     roomId: string;
@@ -36,6 +37,19 @@ interface IState {
     canSetAvatar: boolean;
 }
 
+function idNameForRoom(room: Room): string {
+    const dmMapUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
+    // If the room is a DM, we use the other user's ID for the color hash
+    // in order to match the room avatar with their avatar
+    if (dmMapUserId) return dmMapUserId;
+
+    if (room instanceof LocalRoom && room.targets.length === 1) {
+        return room.targets[0].userId;
+    }
+
+    return room.roomId;
+}
+
 // TODO: Merge with ProfileSettings?
 export default class RoomProfileSettings extends React.Component<IProps, IState> {
     private avatarUpload = createRef<HTMLInputElement>();
diff --git a/src/components/views/rooms/Autocomplete.tsx b/src/components/views/rooms/Autocomplete.tsx
index 31d32da53c..a7a211e828 100644
--- a/src/components/views/rooms/Autocomplete.tsx
+++ b/src/components/views/rooms/Autocomplete.tsx
@@ -10,7 +10,6 @@ import React, { createRef, type RefObject } from "react";
 import classNames from "classnames";
 import { flatMap } from "lodash";
 import { type Room } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import Autocompleter, {
     type ICompletion,
@@ -177,7 +176,7 @@ export default class Autocomplete extends React.PureComponent<IProps, IState> {
             }
         }
 
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         this.setState(
             {
                 completions,
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 7baa127f16..2c10d0afd9 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.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, { createRef, forwardRef, type JSX, type MouseEvent, type ReactNode } from "react";
+import React, { createRef, type JSX, type Ref, type MouseEvent, type ReactNode } from "react";
 import classNames from "classnames";
 import {
     EventStatus,
@@ -228,6 +228,8 @@ export interface EventTileProps {
     // The following properties are used by EventTilePreview to disable tab indexes within the event tile
     hideTimestamp?: boolean;
     inhibitInteraction?: boolean;
+
+    ref?: Ref<UnwrappedEventTile>;
 }
 
 interface IState {
@@ -1482,15 +1484,13 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
 }
 
 // Wrap all event tiles with the tile error boundary so that any throws even during construction are captured
-const SafeEventTile = forwardRef<UnwrappedEventTile, EventTileProps>((props, ref) => {
+const SafeEventTile = (props: EventTileProps): JSX.Element => {
     return (
-        <>
-            <TileErrorBoundary mxEvent={props.mxEvent} layout={props.layout ?? Layout.Group}>
-                <UnwrappedEventTile ref={ref} {...props} />
-            </TileErrorBoundary>
-        </>
+        <TileErrorBoundary mxEvent={props.mxEvent} layout={props.layout ?? Layout.Group}>
+            <UnwrappedEventTile {...props} />
+        </TileErrorBoundary>
     );
-});
+};
 export default SafeEventTile;
 
 function E2ePadlockUnencrypted(props: Omit<IE2ePadlockProps, "title" | "icon">): JSX.Element {
diff --git a/src/components/views/rooms/LinkPreviewGroup.tsx b/src/components/views/rooms/LinkPreviewGroup.tsx
index 84943c24e8..69c98cb6c9 100644
--- a/src/components/views/rooms/LinkPreviewGroup.tsx
+++ b/src/components/views/rooms/LinkPreviewGroup.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 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
@@ -17,6 +17,7 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { useAsyncMemo } from "../../../hooks/useAsyncMemo";
+import { useMediaVisible } from "../../../hooks/useMediaVisible";
 
 const INITIAL_NUM_PREVIEWS = 2;
 
@@ -29,6 +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 ts = mxEvent.getTs();
     const previews = useAsyncMemo<[string, IPreviewUrlResponse][]>(
@@ -55,7 +57,13 @@ const LinkPreviewGroup: React.FC<IProps> = ({ links, mxEvent, onCancelClick }) =
     return (
         <div className="mx_LinkPreviewGroup">
             {showPreviews.map(([link, preview], i) => (
-                <LinkPreviewWidget key={link} link={link} preview={preview} mxEvent={mxEvent}>
+                <LinkPreviewWidget
+                    mediaVisible={mediaVisible}
+                    key={link}
+                    link={link}
+                    preview={preview}
+                    mxEvent={mxEvent}
+                >
                     {i === 0 ? (
                         <AccessibleButton
                             className="mx_LinkPreviewGroup_hide"
diff --git a/src/components/views/rooms/LinkPreviewWidget.tsx b/src/components/views/rooms/LinkPreviewWidget.tsx
index 9b381ede7d..0bcbaa940a 100644
--- a/src/components/views/rooms/LinkPreviewWidget.tsx
+++ b/src/components/views/rooms/LinkPreviewWidget.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2016-2021 The Matrix.org Foundation C.I.C.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
@@ -11,7 +11,6 @@ import { decode } from "html-entities";
 import { type MatrixEvent, type IPreviewUrlResponse } from "matrix-js-sdk/src/matrix";
 
 import { Linkify } from "../../../HtmlUtils";
-import SettingsStore from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
 import { mediaFromMxc } from "../../../customisations/Media";
@@ -24,6 +23,7 @@ interface IProps {
     preview: IPreviewUrlResponse;
     mxEvent: MatrixEvent; // the Event associated with the preview
     children?: ReactNode;
+    mediaVisible: boolean;
 }
 
 export default class LinkPreviewWidget extends React.Component<IProps> {
@@ -69,7 +69,7 @@ export default class LinkPreviewWidget extends React.Component<IProps> {
 
         // FIXME: do we want to factor out all image displaying between this and MImageBody - especially for lightboxing?
         let image: string | null = p["og:image"] ?? null;
-        if (!SettingsStore.getValue("showImages")) {
+        if (!this.props.mediaVisible) {
             image = null; // Don't render a button to show the image, just hide it outright
         }
         const imageMaxWidth = 100;
diff --git a/src/components/views/rooms/MemberList/MemberListHeaderView.tsx b/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
index 3c6fad8aa1..88fc07881c 100644
--- a/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
+++ b/src/components/views/rooms/MemberList/MemberListHeaderView.tsx
@@ -52,6 +52,7 @@ const InviteButton: React.FC<Props> = ({ vm }) => {
                     Icon={InviteIcon}
                     disabled={disabled}
                     aria-label={_t("action|invite")}
+                    type="button"
                 />
             </OptionalTooltip>
         );
@@ -67,6 +68,7 @@ const InviteButton: React.FC<Props> = ({ vm }) => {
                 className="mx_MemberListHeaderView_invite_large"
                 disabled={!vm.canInvite}
                 onClick={vm.onInviteButtonClick}
+                type="button"
             >
                 {_t("action|invite")}
             </Button>
diff --git a/src/components/views/rooms/MemberList/MemberListView.tsx b/src/components/views/rooms/MemberList/MemberListView.tsx
index dd04a89209..0b5629685c 100644
--- a/src/components/views/rooms/MemberList/MemberListView.tsx
+++ b/src/components/views/rooms/MemberList/MemberListView.tsx
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { Form } from "@vector-im/compound-web";
-import React from "react";
+import React, { type JSX } from "react";
 import { List, type ListRowProps } from "react-virtualized/dist/commonjs/List";
 import { AutoSizer } from "react-virtualized";
 
@@ -33,7 +33,7 @@ const MemberListView: React.FC<IProps> = (props: IProps) => {
 
     const totalRows = vm.members.length;
 
-    const getRowComponent = (item: MemberWithSeparator): React.JSX.Element => {
+    const getRowComponent = (item: MemberWithSeparator): JSX.Element => {
         if (item === SEPARATOR) {
             return <hr className="mx_MemberListView_separator" />;
         } else if (item.member) {
@@ -64,7 +64,7 @@ const MemberListView: React.FC<IProps> = (props: IProps) => {
         }
     };
 
-    const rowRenderer = ({ key, index, style }: ListRowProps): React.JSX.Element => {
+    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.
diff --git a/src/components/views/rooms/MemberList/tiles/common/E2EIconView.tsx b/src/components/views/rooms/MemberList/tiles/common/E2EIconView.tsx
index c25d40fc58..359bb74b23 100644
--- a/src/components/views/rooms/MemberList/tiles/common/E2EIconView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/common/E2EIconView.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 React from "react";
+import React, { type JSX } from "react";
 import { Tooltip } from "@vector-im/compound-web";
 import VerifiedIcon from "@vector-im/compound-design-tokens/assets/web/icons/verified";
 import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
@@ -14,7 +14,7 @@ import { _t } from "../../../../../../languageHandler";
 import { E2EStatus } from "../../../../../../utils/ShieldUtils";
 import { crossSigningUserTitles } from "../../../E2EIcon";
 
-function getIconFromStatus(status: E2EStatus): React.JSX.Element | undefined {
+function getIconFromStatus(status: E2EStatus): JSX.Element | undefined {
     switch (status) {
         case E2EStatus.Normal:
             return undefined;
diff --git a/src/components/views/rooms/MemberList/tiles/common/PresenceIconView.tsx b/src/components/views/rooms/MemberList/tiles/common/PresenceIconView.tsx
index 855aecf626..ac31084adf 100644
--- a/src/components/views/rooms/MemberList/tiles/common/PresenceIconView.tsx
+++ b/src/components/views/rooms/MemberList/tiles/common/PresenceIconView.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 React from "react";
+import React, { type JSX } from "react";
 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 DNDIcon from "@vector-im/compound-design-tokens/assets/web/icons/presence-strikethrough-8x8";
@@ -19,7 +19,7 @@ interface Props {
 
 export const BUSY_PRESENCE_NAME = new UnstableValue("busy", "org.matrix.msc3026.busy");
 
-function getIconForPresenceState(state: string): React.JSX.Element {
+function getIconForPresenceState(state: string): JSX.Element {
     switch (state) {
         case "online":
             return <OnlineOrUnavailableIcon height="8px" width="8px" className="mx_PresenceIconView_online" />;
diff --git a/src/components/views/rooms/NotificationBadge/StatelessNotificationBadge.tsx b/src/components/views/rooms/NotificationBadge/StatelessNotificationBadge.tsx
index c324e8ccbd..8e44a0a3b9 100644
--- a/src/components/views/rooms/NotificationBadge/StatelessNotificationBadge.tsx
+++ b/src/components/views/rooms/NotificationBadge/StatelessNotificationBadge.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, { forwardRef } from "react";
+import React, { type Ref, type JSX, type ReactNode } from "react";
 import classNames from "classnames";
 
 import { formatCount } from "../../../../utils/FormattingUtils";
@@ -26,6 +26,8 @@ interface Props {
      * for the difference between the two.
      */
     forceDot?: boolean;
+    children?: ReactNode;
+    ref?: Ref<HTMLDivElement>;
 }
 
 interface ClickableProps extends Props {
@@ -45,61 +47,66 @@ interface ClickableProps extends Props {
  * notifications in the room list, it may have a green badge with the number of unread notifications,
  * but somewhere else it may just have a green dot as a more compact representation of the same information.
  */
-export const StatelessNotificationBadge = forwardRef<HTMLDivElement, XOR<Props, ClickableProps>>(
-    ({ symbol, count, level, knocked, forceDot = false, ...props }, ref) => {
-        const hideBold = useSettingValue("feature_hidebold");
+export const StatelessNotificationBadge = ({
+    symbol,
+    count,
+    level,
+    knocked,
+    forceDot = false,
+    ...props
+}: XOR<Props, ClickableProps>): JSX.Element => {
+    const hideBold = useSettingValue("feature_hidebold");
 
-        // Don't show a badge if we don't need to
-        if ((level === NotificationLevel.None || (hideBold && level == NotificationLevel.Activity)) && !knocked) {
-            return <></>;
-        }
+    // Don't show a badge if we don't need to
+    if ((level === NotificationLevel.None || (hideBold && level == NotificationLevel.Activity)) && !knocked) {
+        return <></>;
+    }
 
-        const hasUnreadCount = level >= NotificationLevel.Notification && (!!count || !!symbol);
+    const hasUnreadCount = level >= NotificationLevel.Notification && (!!count || !!symbol);
 
-        const isEmptyBadge = symbol === null && count === 0;
+    const isEmptyBadge = symbol === null && count === 0;
 
-        if (symbol === null && count > 0) {
-            symbol = formatCount(count);
-        }
+    if (symbol === null && count > 0) {
+        symbol = formatCount(count);
+    }
 
-        // We show a dot if either:
-        // * The props force us to, or
-        // * It's just an activity-level notification or (in theory) lower and the room isn't knocked
-        const badgeType =
-            forceDot || (level <= NotificationLevel.Activity && !knocked)
-                ? "dot"
-                : !symbol || symbol.length < 3
-                  ? "badge_2char"
-                  : "badge_3char";
+    // We show a dot if either:
+    // * The props force us to, or
+    // * It's just an activity-level notification or (in theory) lower and the room isn't knocked
+    const badgeType =
+        forceDot || (level <= NotificationLevel.Activity && !knocked)
+            ? "dot"
+            : !symbol || symbol.length < 3
+              ? "badge_2char"
+              : "badge_3char";
 
-        const classes = classNames({
-            "mx_NotificationBadge": true,
-            "mx_NotificationBadge_visible": isEmptyBadge || knocked ? true : hasUnreadCount,
-            "mx_NotificationBadge_level_notification": level == NotificationLevel.Notification,
-            "mx_NotificationBadge_level_highlight": level >= NotificationLevel.Highlight,
-            "mx_NotificationBadge_knocked": knocked,
+    const classes = classNames({
+        "mx_NotificationBadge": true,
+        "mx_NotificationBadge_visible": isEmptyBadge || knocked ? true : hasUnreadCount,
+        "mx_NotificationBadge_level_notification": level == NotificationLevel.Notification,
+        "mx_NotificationBadge_level_highlight": level >= NotificationLevel.Highlight,
+        "mx_NotificationBadge_knocked": knocked,
 
-            // Exactly one of mx_NotificationBadge_dot, mx_NotificationBadge_2char, mx_NotificationBadge_3char
-            "mx_NotificationBadge_dot": badgeType === "dot",
-            "mx_NotificationBadge_2char": badgeType === "badge_2char",
-            "mx_NotificationBadge_3char": badgeType === "badge_3char",
-            // Badges with text should always use light colors
-            "cpd-theme-light": badgeType !== "dot",
-        });
-
-        if (props.onClick) {
-            return (
-                <AccessibleButton {...props} className={classes} onClick={props.onClick} ref={ref}>
-                    <span className="mx_NotificationBadge_count">{symbol}</span>
-                    {props.children}
-                </AccessibleButton>
-            );
-        }
+        // Exactly one of mx_NotificationBadge_dot, mx_NotificationBadge_2char, mx_NotificationBadge_3char
+        "mx_NotificationBadge_dot": badgeType === "dot",
+        "mx_NotificationBadge_2char": badgeType === "badge_2char",
+        "mx_NotificationBadge_3char": badgeType === "badge_3char",
+        // Badges with text should always use light colors
+        "cpd-theme-light": badgeType !== "dot",
+    });
 
+    if (props.onClick) {
         return (
-            <div className={classes} ref={ref}>
+            <AccessibleButton {...props} className={classes} onClick={props.onClick} ref={props.ref}>
                 <span className="mx_NotificationBadge_count">{symbol}</span>
-            </div>
+                {props.children}
+            </AccessibleButton>
         );
-    },
-);
+    }
+
+    return (
+        <div className={classes} ref={props.ref}>
+            <span className="mx_NotificationBadge_count">{symbol}</span>
+        </div>
+    );
+};
diff --git a/src/components/views/rooms/NotificationDecoration.tsx b/src/components/views/rooms/NotificationDecoration.tsx
index 4a2f62cb5a..a93f1428fd 100644
--- a/src/components/views/rooms/NotificationDecoration.tsx
+++ b/src/components/views/rooms/NotificationDecoration.tsx
@@ -7,18 +7,26 @@
 
 import React, { type HTMLProps, type JSX } from "react";
 import MentionIcon from "@vector-im/compound-design-tokens/assets/web/icons/mention";
-import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error";
+import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
 import NotificationOffIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications-off-solid";
+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 { Flex } from "../../utils/Flex";
 import { type RoomNotificationState } from "../../../stores/notifications/RoomNotificationState";
+import { useTypedEventEmitterState } from "../../../hooks/useEventEmitter";
+import { NotificationStateEvents } from "../../../stores/notifications/NotificationState";
 
 interface NotificationDecorationProps extends HTMLProps<HTMLDivElement> {
     /**
      * The notification state of the room or thread.
      */
     notificationState: RoomNotificationState;
+    /**
+     * Whether the room has a video call.
+     */
+    hasVideoCall: boolean;
 }
 
 /**
@@ -26,30 +34,43 @@ interface NotificationDecorationProps extends HTMLProps<HTMLDivElement> {
  */
 export function NotificationDecoration({
     notificationState,
+    hasVideoCall,
     ...props
 }: NotificationDecorationProps): JSX.Element | null {
+    // Listen to the notification state and update the component when it changes
     const {
         hasAnyNotificationOrActivity,
-        isUnsetMessage,
+        isUnsentMessage,
         invited,
         isMention,
         isActivityNotification,
         isNotification,
         count,
         muted,
-    } = notificationState;
-    if (!hasAnyNotificationOrActivity && !muted) return null;
+    } = useTypedEventEmitterState(notificationState, NotificationStateEvents.Update, () => ({
+        hasAnyNotificationOrActivity: notificationState.hasAnyNotificationOrActivity,
+        isUnsentMessage: notificationState.isUnsentMessage,
+        invited: notificationState.invited,
+        isMention: notificationState.isMention,
+        isActivityNotification: notificationState.isActivityNotification,
+        isNotification: notificationState.isNotification,
+        count: notificationState.count,
+        muted: notificationState.muted,
+    }));
+
+    if (!hasAnyNotificationOrActivity && !muted && !hasVideoCall) return null;
 
     return (
         <Flex
             align="center"
             justify="center"
-            gap="var(--cpd-space-1-5x)"
+            gap="var(--cpd-space-1x)"
             {...props}
             data-testid="notification-decoration"
         >
-            {isUnsetMessage && <ErrorIcon width="20px" height="20px" fill="var(--cpd-color-icon-critical-primary)" />}
-            {invited && <UnreadCounter count={1} />}
+            {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)" />}
+            {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} />}
             {isActivityNotification && <Unread />}
diff --git a/src/components/views/rooms/RoomHeader/CallGuestLinkButton.tsx b/src/components/views/rooms/RoomHeader/CallGuestLinkButton.tsx
index 7675f66070..16ef5c2234 100644
--- a/src/components/views/rooms/RoomHeader/CallGuestLinkButton.tsx
+++ b/src/components/views/rooms/RoomHeader/CallGuestLinkButton.tsx
@@ -14,10 +14,11 @@ import { EventType, JoinRule, type Room } from "matrix-js-sdk/src/matrix";
 import Modal from "../../../../Modal";
 import { ShareDialog } from "../../dialogs/ShareDialog";
 import { _t } from "../../../../languageHandler";
-import SettingsStore from "../../../../settings/SettingsStore";
 import { calculateRoomVia } from "../../../../utils/permalinks/Permalinks";
 import BaseDialog from "../../dialogs/BaseDialog";
 import { useGuestAccessInformation } from "../../../../hooks/room/useGuestAccessInformation";
+import JoinRuleSettings from "../../settings/JoinRuleSettings";
+import SettingsStore from "../../../../settings/SettingsStore";
 
 /**
  * Display a button to open a dialog to share a link to the call using a element call guest spa url (`element_call:guest_spa_url` in the EW config).
@@ -114,33 +115,32 @@ export const JoinRuleDialog: React.FC<{
                 "",
             );
             // Show the dialog for a bit to give the user feedback
-            setTimeout(() => onFinished(), 500);
+            setTimeout(() => onFinished(), 1000);
         },
         [isUpdating, onFinished, room.client, room.roomId],
     );
     return (
         <BaseDialog title={_t("update_room_access_modal|title")} onFinished={onFinished} className="mx_JoinRuleDialog">
-            <p>{_t("update_room_access_modal|description")}</p>
-            <div className="mx_JoinRuleDialogButtons">
-                {askToJoinEnabled && canInvite && (
-                    <Button
-                        kind="secondary"
-                        className="mx_Dialog_nonDialogButton"
-                        disabled={isUpdating === JoinRule.Knock}
-                        onClick={() => changeJoinRule(JoinRule.Knock)}
-                    >
-                        {_t("action|ask_to_join")}
-                    </Button>
-                )}
-                <Button
-                    className="mx_Dialog_nonDialogButton"
-                    kind="destructive"
-                    disabled={isUpdating === JoinRule.Public}
-                    onClick={() => changeJoinRule(JoinRule.Public)}
-                >
-                    {_t("common|public")}
-                </Button>
-            </div>
+            <p>{_t("update_room_access_modal|description", {}, { b: (sub) => <strong>{sub}</strong> })}</p>
+            <p>
+                {_t("update_room_access_modal|revert_access_description", {}, { b: (sub) => <strong>{sub}</strong> })}
+            </p>
+            <JoinRuleSettings
+                recommendedOption={JoinRule.Knock}
+                room={room}
+                disabledOptions={new Set([JoinRule.Invite, JoinRule.Private, JoinRule.Restricted])}
+                hiddenOptions={
+                    new Set([JoinRule.Restricted].concat(askToJoinEnabled && canInvite ? [] : [JoinRule.Knock]))
+                }
+                beforeChange={async (newRule) => {
+                    await changeJoinRule(newRule).catch(() => {
+                        return false;
+                    });
+                    return true;
+                }}
+                closeSettingsFn={() => {}}
+                onError={(error: unknown) => logger.error("Could not generate change access level:", error)}
+            />
             <p>{_t("update_room_access_modal|dont_change_description")}</p>
             <div className="mx_JoinRuleDialogButtons">
                 <Button
diff --git a/src/components/views/rooms/RoomHeader/RoomHeader.tsx b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
index 4462e4468a..663c8e9ff0 100644
--- a/src/components/views/rooms/RoomHeader/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
@@ -178,7 +178,10 @@ export default function RoomHeader({
                                 aria-label={label}
                                 children={children}
                                 className="mx_RoomHeader_videoCallOption"
-                                onClick={(ev) => videoCallClick(ev, option)}
+                                onClick={(ev) => {
+                                    setMenuOpen(false);
+                                    videoCallClick(ev, option);
+                                }}
                                 Icon={VideoCallIcon}
                                 onSelect={() => {} /* Dummy handler since we want the click event.*/}
                             />
diff --git a/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx b/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
index c4824e2b45..1f04e4c86e 100644
--- a/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
+++ b/src/components/views/rooms/RoomListPanel/EmptyRoomList.tsx
@@ -53,7 +53,29 @@ export function EmptyRoomList({ vm }: EmptyRoomListProps): JSX.Element | undefin
                 />
             );
         case FilterKey.UnreadFilter:
-            return <UnreadPlaceholder filter={vm.activePrimaryFilter} />;
+            return (
+                <ActionPlaceholder
+                    title={_t("room_list|empty|no_unread")}
+                    action={_t("room_list|empty|show_chats")}
+                    filter={vm.activePrimaryFilter}
+                />
+            );
+        case FilterKey.InvitesFilter:
+            return (
+                <ActionPlaceholder
+                    title={_t("room_list|empty|no_invites")}
+                    action={_t("room_list|empty|show_activity")}
+                    filter={vm.activePrimaryFilter}
+                />
+            );
+        case FilterKey.MentionsFilter:
+            return (
+                <ActionPlaceholder
+                    title={_t("room_list|empty|no_mentions")}
+                    action={_t("room_list|empty|show_activity")}
+                    filter={vm.activePrimaryFilter}
+                />
+            );
         default:
             return undefined;
     }
@@ -131,18 +153,21 @@ function DefaultPlaceholder({ vm }: DefaultPlaceholderProps): JSX.Element {
     );
 }
 
-interface UnreadPlaceholderProps {
+interface ActionPlaceholderProps {
     filter: PrimaryFilter;
+    title: string;
+    action: string;
 }
 
 /**
- * The empty state for the room list when the unread filter is active
+ * A placeholder for the room list when a filter is active
+ * The user can take action to toggle the filter
  */
-function UnreadPlaceholder({ filter }: UnreadPlaceholderProps): JSX.Element {
+function ActionPlaceholder({ filter, title, action }: ActionPlaceholderProps): JSX.Element {
     return (
-        <GenericPlaceholder title={_t("room_list|empty|no_unread")}>
+        <GenericPlaceholder title={title}>
             <Button kind="tertiary" onClick={filter.toggle}>
-                {_t("room_list|empty|show_chats")}
+                {action}
             </Button>
         </GenericPlaceholder>
     );
diff --git a/src/components/views/rooms/RoomListPanel/RoomList.tsx b/src/components/views/rooms/RoomListPanel/RoomList.tsx
index 67f36b2a19..f5f610f5ae 100644
--- a/src/components/views/rooms/RoomListPanel/RoomList.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomList.tsx
@@ -11,6 +11,10 @@ import { AutoSizer, List, type ListRowProps } from "react-virtualized";
 import { type RoomListViewState } from "../../../viewmodels/roomlist/RoomListViewModel";
 import { _t } from "../../../../languageHandler";
 import { RoomListItemView } from "./RoomListItemView";
+import { RovingTabIndexProvider } from "../../../../accessibility/RovingTabIndex";
+import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
+import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
+import { Landmark, LandmarkNavigation } from "../../../../accessibility/LandmarkNavigation";
 
 interface RoomListProps {
     /**
@@ -32,21 +36,45 @@ export function RoomList({ vm: { rooms, activeIndex } }: RoomListProps): JSX.Ele
 
     // The first div is needed to make the virtualized list take all the remaining space and scroll correctly
     return (
-        <div className="mx_RoomList" data-testid="room-list">
-            <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}
-                    />
-                )}
-            </AutoSizer>
-        </div>
+        <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>
     );
 }
diff --git a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
index 213d83c605..752f065fd4 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListHeaderView.tsx
@@ -21,6 +21,7 @@ import {
     type RoomListHeaderViewState,
     useRoomListHeaderViewModel,
 } from "../../../viewmodels/roomlist/RoomListHeaderViewModel";
+import { RoomListOptionsMenu } from "./RoomListOptionsMenu";
 
 /**
  * The header view for the room list
@@ -42,14 +43,17 @@ export function RoomListHeaderView(): JSX.Element {
                 <h1 title={vm.title}>{vm.title}</h1>
                 {vm.displaySpaceMenu && <SpaceMenu vm={vm} />}
             </Flex>
-            {/* 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 />
-                </IconButton>
-            )}
+            <Flex align="center" gap="var(--cpd-space-2x)">
+                <RoomListOptionsMenu vm={vm} />
+                {/* 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>
+                )}
+            </Flex>
         </Flex>
     );
 }
@@ -76,20 +80,36 @@ function SpaceMenu({ vm }: SpaceMenuProps): JSX.Element {
             align="start"
             trigger={
                 <IconButton className="mx_SpaceMenu_button" aria-label={_t("room_list|open_space_menu")} size="20px">
-                    <ChevronDownIcon />
+                    <ChevronDownIcon color="var(--cpd-color-icon-secondary)" />
                 </IconButton>
             }
         >
-            <MenuItem Icon={HomeIcon} label={_t("room_list|space_menu|home")} onSelect={vm.openSpaceHome} />
+            <MenuItem
+                Icon={HomeIcon}
+                label={_t("room_list|space_menu|home")}
+                onSelect={vm.openSpaceHome}
+                hideChevron={true}
+            />
             {vm.canInviteInSpace && (
-                <MenuItem Icon={UserAddIcon} label={_t("action|invite")} onSelect={vm.inviteInSpace} />
+                <MenuItem
+                    Icon={UserAddIcon}
+                    label={_t("action|invite")}
+                    onSelect={vm.inviteInSpace}
+                    hideChevron={true}
+                />
             )}
-            <MenuItem Icon={PreferencesIcon} label={_t("common|preferences")} onSelect={vm.openSpacePreferences} />
+            <MenuItem
+                Icon={PreferencesIcon}
+                label={_t("common|preferences")}
+                onSelect={vm.openSpacePreferences}
+                hideChevron={true}
+            />
             {vm.canAccessSpaceSettings && (
                 <MenuItem
                     Icon={SettingsIcon}
                     label={_t("room_list|space_menu|space_settings")}
                     onSelect={vm.openSpaceSettings}
+                    hideChevron={true}
                 />
             )}
         </Menu>
@@ -119,14 +139,26 @@ function ComposeMenu({ vm }: ComposeMenuProps): JSX.Element {
             align="start"
             trigger={
                 <IconButton aria-label={_t("action|add")}>
-                    <ComposeIcon />
+                    <ComposeIcon color="var(--cpd-color-icon-secondary)" />
                 </IconButton>
             }
         >
-            <MenuItem Icon={UserAddIcon} label={_t("action|new_message")} onSelect={vm.createChatRoom} />
-            {vm.canCreateRoom && <MenuItem Icon={RoomIcon} label={_t("action|new_room")} onSelect={vm.createRoom} />}
+            <MenuItem
+                Icon={UserAddIcon}
+                label={_t("action|new_message")}
+                onSelect={vm.createChatRoom}
+                hideChevron={true}
+            />
+            {vm.canCreateRoom && (
+                <MenuItem Icon={RoomIcon} label={_t("action|new_room")} onSelect={vm.createRoom} hideChevron={true} />
+            )}
             {vm.canCreateVideoRoom && (
-                <MenuItem Icon={VideoCallIcon} label={_t("action|new_video_room")} onSelect={vm.createVideoRoom} />
+                <MenuItem
+                    Icon={VideoCallIcon}
+                    label={_t("action|new_video_room")}
+                    onSelect={vm.createVideoRoom}
+                    hideChevron={true}
+                />
             )}
         </Menu>
     );
diff --git a/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx b/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
index 00d23cc2d2..fa7a85b54f 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListItemMenuView.tsx
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type ComponentProps, forwardRef, type JSX, useState } from "react";
+import React, { type ComponentProps, type JSX, type Ref, useState } from "react";
 import { IconButton, Menu, MenuItem, Separator, ToggleMenuItem, Tooltip } 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";
@@ -15,6 +15,9 @@ import UserAddIcon from "@vector-im/compound-design-tokens/assets/web/icons/user
 import LinkIcon from "@vector-im/compound-design-tokens/assets/web/icons/link";
 import LeaveIcon from "@vector-im/compound-design-tokens/assets/web/icons/leave";
 import OverflowIcon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
+import NotificationIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications-solid";
+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 { _t } from "../../../../languageHandler";
@@ -23,6 +26,7 @@ import {
     type RoomListItemMenuViewState,
     useRoomListItemMenuViewModel,
 } from "../../../viewmodels/roomlist/RoomListItemMenuViewModel";
+import { RoomNotifState } from "../../../../RoomNotifs";
 
 interface RoomListItemMenuViewProps {
     /**
@@ -43,8 +47,9 @@ export function RoomListItemMenuView({ room, setMenuOpen }: RoomListItemMenuView
     const vm = useRoomListItemMenuViewModel(room);
 
     return (
-        <Flex className="mx_RoomListItemMenuView" align="center" gap="var(--cpd-space-0-5x)">
+        <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>
     );
 }
@@ -85,6 +90,7 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                     label={_t("room_list|more_options|mark_read")}
                     onSelect={vm.markAsRead}
                     onClick={(evt) => evt.stopPropagation()}
+                    hideChevron={true}
                 />
             )}
             {vm.canMarkAsUnread && (
@@ -93,6 +99,7 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                     label={_t("room_list|more_options|mark_unread")}
                     onSelect={vm.markAsUnread}
                     onClick={(evt) => evt.stopPropagation()}
+                    hideChevron={true}
                 />
             )}
             <ToggleMenuItem
@@ -102,7 +109,8 @@ 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}
@@ -114,6 +122,7 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                     label={_t("action|invite")}
                     onSelect={vm.invite}
                     onClick={(evt) => evt.stopPropagation()}
+                    hideChevron={true}
                 />
             )}
             {vm.canCopyRoomLink && (
@@ -122,6 +131,7 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                     label={_t("room_list|more_options|copy_link")}
                     onSelect={vm.copyRoomLink}
                     onClick={(evt) => evt.stopPropagation()}
+                    hideChevron={true}
                 />
             )}
             <Separator />
@@ -131,24 +141,119 @@ function MoreOptionsMenu({ vm, setMenuOpen }: MoreOptionsMenuProps): JSX.Element
                 label={_t("room_list|more_options|leave_room")}
                 onSelect={vm.leaveRoom}
                 onClick={(evt) => evt.stopPropagation()}
+                hideChevron={true}
             />
         </Menu>
     );
 }
 
-interface MoreOptionsButtonProps extends ComponentProps<typeof IconButton> {}
+interface MoreOptionsButtonProps extends ComponentProps<typeof IconButton> {
+    ref?: Ref<HTMLButtonElement>;
+}
 
 /**
  * A button to trigger the more options menu.
  */
-export const MoreOptionsButton = forwardRef<HTMLButtonElement, MoreOptionsButtonProps>(
-    function MoreOptionsButton(props, ref) {
-        return (
-            <Tooltip label={_t("room_list|room|more_options")}>
-                <IconButton aria-label={_t("room_list|room|more_options")} {...props} ref={ref}>
-                    <OverflowIcon />
-                </IconButton>
-            </Tooltip>
-        );
-    },
-);
+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 {
+    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);
+            }}
+            title={_t("room_list|notification_options")}
+            showTitle={false}
+            align="start"
+            trigger={<NotificationButton isRoomMuted={vm.isNotificationMute} size="24px" />}
+        >
+            <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>
+        </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 637ac265cc..ac4d72ec57 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListItemView.tsx
@@ -5,17 +5,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type JSX, useState } from "react";
+import React, { type JSX, memo, useCallback, useRef, useState } from "react";
 import { type Room } from "matrix-js-sdk/src/matrix";
 import classNames from "classnames";
 
 import { useRoomListItemViewModel } from "../../../viewmodels/roomlist/RoomListItemViewModel";
-import DecoratedRoomAvatar from "../../avatars/DecoratedRoomAvatar";
 import { Flex } from "../../../utils/Flex";
 import { RoomListItemMenuView } from "./RoomListItemMenuView";
 import { NotificationDecoration } from "../NotificationDecoration";
+import { RoomAvatarView } from "../../avatars/RoomAvatarView";
+import { useRovingTabIndex } from "../../../../accessibility/RovingTabIndex";
 
-interface RoomListItemViewPropsProps extends React.HTMLAttributes<HTMLButtonElement> {
+interface RoomListItemViewProps extends React.HTMLAttributes<HTMLButtonElement> {
     /**
      * The room to display
      */
@@ -29,64 +30,124 @@ interface RoomListItemViewPropsProps extends React.HTMLAttributes<HTMLButtonElem
 /**
  * An item in the room list
  */
-export function RoomListItemView({ room, isSelected, ...props }: RoomListItemViewPropsProps): JSX.Element {
+export const RoomListItemView = memo(function RoomListItemView({
+    room,
+    isSelected,
+    ...props
+}: RoomListItemViewProps): JSX.Element {
+    const buttonRef = useRef<HTMLButtonElement>(null);
+    const [onFocus, isActive, ref] = useRovingTabIndex(buttonRef);
+
     const vm = useRoomListItemViewModel(room);
 
-    const [isHover, setIsHover] = useState(false);
+    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) && vm.showHoverMenu;
-
-    const isNotificationDecorationVisible =
-        !showHoverDecoration && (vm.notificationState.hasAnyNotificationOrActivity || vm.notificationState.muted);
+    const showHoverDecoration = isMenuOpen || isHover;
+    const showHoverMenu = showHoverDecoration && vm.showHoverMenu;
 
     return (
         <button
+            ref={ref}
             className={classNames("mx_RoomListItemView", {
-                mx_RoomListItemView_empty: !isNotificationDecorationVisible && !showHoverDecoration,
-                mx_RoomListItemView_notification_decoration: isNotificationDecorationVisible,
-                mx_RoomListItemView_menu_open: showHoverDecoration,
+                mx_RoomListItemView_hover: showHoverDecoration,
+                mx_RoomListItemView_menu_open: showHoverMenu,
                 mx_RoomListItemView_selected: isSelected,
+                mx_RoomListItemView_bold: vm.isBold,
             })}
             type="button"
             aria-selected={isSelected}
             aria-label={vm.a11yLabel}
             onClick={() => vm.openRoom()}
-            onMouseOver={() => setIsHover(true)}
-            onMouseOut={() => setIsHover(false)}
-            onFocus={() => setIsHover(true)}
-            onBlur={() => setIsHover(false)}
+            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}
             {...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">
-                <DecoratedRoomAvatar room={room} size="32px" />
+                <RoomAvatarView room={room} />
                 <Flex
                     className="mx_RoomListItemView_content"
-                    gap="var(--cpd-space-3x)"
+                    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 */}
-                    <span title={room.name}>{room.name}</span>
-                    {showHoverDecoration ? (
+                    <div className="mx_RoomListItemView_text">
+                        <div className="mx_RoomListItemView_roomName" title={vm.name}>
+                            {vm.name}
+                        </div>
+                        <div className="mx_RoomListItemView_messagePreview">{vm.messagePreview}</div>
+                    </div>
+                    {showHoverMenu ? (
                         <RoomListItemMenuView
                             room={room}
                             setMenuOpen={(isOpen) => {
-                                if (isOpen) setIsMenuOpen(isOpen);
-                                // To avoid icon blinking when closing the menu, we delay the state update
-                                else setTimeout(() => setIsMenuOpen(isOpen), 0);
+                                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 */}
-                            <NotificationDecoration notificationState={vm.notificationState} aria-hidden={true} />
+                            {vm.showNotificationDecoration && (
+                                <NotificationDecoration
+                                    notificationState={vm.notificationState}
+                                    aria-hidden={true}
+                                    hasVideoCall={vm.hasParticipantInCall}
+                                />
+                            )}
                         </>
                     )}
                 </Flex>
             </Flex>
         </button>
     );
+});
+
+/**
+ * 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
new file mode 100644
index 0000000000..d851ca34b5
--- /dev/null
+++ b/src/components/views/rooms/RoomListPanel/RoomListOptionsMenu.tsx
@@ -0,0 +1,68 @@
+/*
+ * 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 { IconButton, Menu, MenuTitle, Tooltip, RadioMenuItem } from "@vector-im/compound-web";
+import React, { type Ref, type JSX, useState, useCallback } from "react";
+import OverflowHorizontalIcon from "@vector-im/compound-design-tokens/assets/web/icons/overflow-horizontal";
+
+import { _t } from "../../../../languageHandler";
+import { SortOption } from "../../../viewmodels/roomlist/useSorter";
+import { type RoomListHeaderViewState } from "../../../viewmodels/roomlist/RoomListHeaderViewModel";
+
+interface MenuTriggerProps extends React.ComponentProps<typeof IconButton> {
+    ref?: Ref<HTMLButtonElement>;
+}
+
+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}>
+            <OverflowHorizontalIcon color="var(--cpd-color-icon-secondary)" />
+        </IconButton>
+    </Tooltip>
+);
+
+interface Props {
+    /**
+     * The view model for the room list view
+     */
+    vm: RoomListHeaderViewState;
+}
+
+export function RoomListOptionsMenu({ vm }: Props): JSX.Element {
+    const [open, setOpen] = useState(false);
+
+    const onActivitySelected = useCallback(() => {
+        vm.sort(SortOption.Activity);
+    }, [vm]);
+
+    const onAtoZSelected = useCallback(() => {
+        vm.sort(SortOption.AToZ);
+    }, [vm]);
+
+    return (
+        <Menu
+            open={open}
+            onOpenChange={setOpen}
+            title={_t("room_list|room_options")}
+            showTitle={false}
+            align="start"
+            trigger={<MenuTrigger />}
+        >
+            <MenuTitle title={_t("room_list|sort")} />
+            <RadioMenuItem
+                label={_t("room_list|sort_type|activity")}
+                checked={vm.activeSortOption === SortOption.Activity}
+                onSelect={onActivitySelected}
+            />
+            <RadioMenuItem
+                label={_t("room_list|sort_type|atoz")}
+                checked={vm.activeSortOption === SortOption.AToZ}
+                onSelect={onAtoZSelected}
+            />
+        </Menu>
+    );
+}
diff --git a/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
index 6809841075..26f0ff8bae 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListSearch.tsx
@@ -55,7 +55,7 @@ export function RoomListSearch({ activeSpace }: RoomListSearchProps): JSX.Elemen
                 onClick={() => defaultDispatcher.fire(Action.OpenSpotlight)}
             >
                 <Flex as="span" justify="space-between">
-                    {_t("action|search")}
+                    <span className="mx_RoomListSearch_search_text">{_t("action|search")}</span>
                     <kbd>{IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K"}</kbd>
                 </Flex>
             </Button>
diff --git a/src/components/views/rooms/RoomListPanel/RoomListView.tsx b/src/components/views/rooms/RoomListPanel/RoomListView.tsx
index f4800f7009..f6d99625aa 100644
--- a/src/components/views/rooms/RoomListPanel/RoomListView.tsx
+++ b/src/components/views/rooms/RoomListPanel/RoomListView.tsx
@@ -18,11 +18,18 @@ import { RoomListPrimaryFilters } from "./RoomListPrimaryFilters";
 export function RoomListView(): JSX.Element {
     const vm = useRoomListViewModel();
     const isRoomListEmpty = vm.rooms.length === 0;
-
+    let listBody;
+    if (vm.isLoadingRooms) {
+        listBody = <div className="mx_RoomListSkeleton" />;
+    } else if (isRoomListEmpty) {
+        listBody = <EmptyRoomList vm={vm} />;
+    } else {
+        listBody = <RoomList vm={vm} />;
+    }
     return (
         <>
             <RoomListPrimaryFilters vm={vm} />
-            {isRoomListEmpty ? <EmptyRoomList vm={vm} /> : <RoomList vm={vm} />}
+            {listBody}
         </>
     );
 }
diff --git a/src/components/views/rooms/RoomPreviewBar.tsx b/src/components/views/rooms/RoomPreviewBar.tsx
index 99b5b9b935..6939fec099 100644
--- a/src/components/views/rooms/RoomPreviewBar.tsx
+++ b/src/components/views/rooms/RoomPreviewBar.tsx
@@ -14,6 +14,7 @@ import {
     type RoomPreviewOpts,
     RoomViewLifecycle,
 } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
+import { Button } from "@vector-im/compound-web";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";
@@ -90,12 +91,18 @@ interface IProps {
     roomAlias?: string;
 
     onJoinClick?(): void;
-    onRejectClick?(): void;
-    onRejectAndIgnoreClick?(): void;
+    onDeclineClick?(): void;
+    onDeclineAndBlockClick?(): void;
     onForgetClick?(): void;
 
     canAskToJoinAndMembershipIsLeave?: boolean;
     promptAskToJoin?: boolean;
+
+    /**
+     * If true, this will prompt for additional safety options
+     * like reporting an invite or ignoring the user.
+     */
+    promptRejectionOptions?: boolean;
     knocked?: boolean;
     onSubmitAskToJoin?(reason?: string): void;
     onCancelAskToJoin?(): void;
@@ -313,6 +320,8 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         let primaryActionLabel: string | undefined;
         let secondaryActionHandler: (() => void) | undefined;
         let secondaryActionLabel: string | undefined;
+        let dangerActionHandler: (() => void) | undefined;
+        let dangerActionLabel: string | undefined;
         let footer: JSX.Element | undefined;
         const extraComponents: JSX.Element[] = [];
 
@@ -549,16 +558,11 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 }
 
                 primaryActionHandler = this.props.onJoinClick;
-                secondaryActionLabel = _t("action|reject");
-                secondaryActionHandler = this.props.onRejectClick;
+                secondaryActionLabel = _t("action|decline");
+                secondaryActionHandler = this.props.onDeclineClick;
+                dangerActionLabel = _t("action|decline_and_block");
+                dangerActionHandler = this.props.onDeclineAndBlockClick;
 
-                if (this.props.onRejectAndIgnoreClick) {
-                    extraComponents.push(
-                        <AccessibleButton kind="secondary" onClick={this.props.onRejectAndIgnoreClick} key="ignore">
-                            {_t("room|invite_reject_ignore")}
-                        </AccessibleButton>,
-                    );
-                }
                 break;
             }
             case MessageCase.ViewingRoom: {
@@ -691,6 +695,15 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
             );
         }
 
+        let dangerActionButton;
+        if (dangerActionHandler) {
+            dangerActionButton = (
+                <Button destructive kind="tertiary" onClick={dangerActionHandler}>
+                    {dangerActionLabel}
+                </Button>
+            );
+        }
+
         const isPanel = this.props.canPreview;
 
         const classes = classNames("mx_RoomPreviewBar", `mx_RoomPreviewBar_${messageCase}`, {
@@ -701,6 +714,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
         // ensure correct tab order for both views
         const actions = isPanel ? (
             <>
+                {dangerActionButton}
                 {secondaryButton}
                 {extraComponents}
                 {primaryButton}
@@ -710,6 +724,7 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
                 {primaryButton}
                 {extraComponents}
                 {secondaryButton}
+                {dangerActionButton}
             </>
         );
 
diff --git a/src/components/views/rooms/RoomPreviewCard.tsx b/src/components/views/rooms/RoomPreviewCard.tsx
index 953d8e551a..21f6e09a6d 100644
--- a/src/components/views/rooms/RoomPreviewCard.tsx
+++ b/src/components/views/rooms/RoomPreviewCard.tsx
@@ -112,7 +112,7 @@ const RoomPreviewCard: FC<IProps> = ({ room, onJoinButtonClicked, onRejectButton
                         onRejectButtonClicked();
                     }}
                 >
-                    {_t("action|reject")}
+                    {_t("action|decline")}
                 </AccessibleButton>
                 <AccessibleButton
                     kind="primary"
diff --git a/src/components/views/rooms/RoomSearchAuxPanel.tsx b/src/components/views/rooms/RoomSearchAuxPanel.tsx
index fa0a24abe9..be821c7de1 100644
--- a/src/components/views/rooms/RoomSearchAuxPanel.tsx
+++ b/src/components/views/rooms/RoomSearchAuxPanel.tsx
@@ -40,6 +40,8 @@ const RoomSearchAuxPanel: React.FC<Props> = ({ searchInfo, isRoomEncrypted, onSe
                                 { count: searchInfo.count },
                                 { query: () => <strong>{searchInfo.term}</strong> },
                             )
+                        ) : searchInfo?.error !== undefined ? (
+                            searchInfo?.error.message
                         ) : (
                             <InlineSpinner />
                         )}
diff --git a/src/components/views/rooms/wysiwyg_composer/EditWysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/EditWysiwygComposer.tsx
index 2ea87fc68e..c84f130f34 100644
--- a/src/components/views/rooms/wysiwyg_composer/EditWysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/EditWysiwygComposer.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 ForwardedRef, forwardRef, type RefObject, useMemo } from "react";
+import React, { type JSX, type RefObject, useMemo, type ReactNode } from "react";
 import classNames from "classnames";
 
 import type EditorStateTransfer from "../../../../utils/EditorStateTransfer";
@@ -21,15 +21,13 @@ import { type ComposerFunctions } from "./types";
 interface ContentProps {
     disabled?: boolean;
     composerFunctions: ComposerFunctions;
+    ref?: RefObject<HTMLElement | null>;
 }
 
-const Content = forwardRef<HTMLElement, ContentProps>(function Content(
-    { disabled = false, composerFunctions }: ContentProps,
-    forwardRef: ForwardedRef<HTMLElement>,
-) {
-    useWysiwygEditActionHandler(disabled, forwardRef as RefObject<HTMLElement>, composerFunctions);
+const Content = function Content({ disabled = false, composerFunctions, ref }: ContentProps): ReactNode {
+    useWysiwygEditActionHandler(disabled, ref, composerFunctions);
     return null;
-});
+};
 
 interface EditWysiwygComposerProps {
     disabled?: boolean;
diff --git a/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx b/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx
index fb399dda28..9b21eef545 100644
--- a/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/SendWysiwygComposer.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 ForwardedRef, forwardRef, type RefObject, useMemo } from "react";
+import React, { type JSX, type RefObject, useMemo, type ReactNode } from "react";
 import { type IEventRelation } from "matrix-js-sdk/src/matrix";
 
 import { useWysiwygSendActionHandler } from "./hooks/useWysiwygSendActionHandler";
@@ -22,15 +22,13 @@ import { ComposerContext, getDefaultContextValue } from "./ComposerContext";
 interface ContentProps {
     disabled?: boolean;
     composerFunctions: ComposerFunctions;
+    ref?: RefObject<HTMLElement | null>;
 }
 
-const Content = forwardRef<HTMLElement, ContentProps>(function Content(
-    { disabled = false, composerFunctions }: ContentProps,
-    forwardRef: ForwardedRef<HTMLElement>,
-) {
-    useWysiwygSendActionHandler(disabled, forwardRef as RefObject<HTMLElement>, composerFunctions);
+const Content = function Content({ disabled = false, composerFunctions, ref }: ContentProps): ReactNode {
+    useWysiwygSendActionHandler(disabled, ref, composerFunctions);
     return null;
-});
+};
 
 export interface SendWysiwygComposerProps {
     initialContent?: string;
diff --git a/src/components/views/rooms/wysiwyg_composer/components/Editor.tsx b/src/components/views/rooms/wysiwyg_composer/components/Editor.tsx
index d46318af04..d418a0df19 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/Editor.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/Editor.tsx
@@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import classNames from "classnames";
-import React, { type CSSProperties, forwardRef, memo, type RefObject, type ReactNode } from "react";
+import React, { type CSSProperties, memo, type RefObject, type ReactNode } from "react";
 
 import { useIsExpanded } from "../hooks/useIsExpanded";
 import { useSelection } from "../hooks/useSelection";
@@ -19,44 +19,36 @@ interface EditorProps {
     placeholder?: string;
     leftComponent?: ReactNode;
     rightComponent?: ReactNode;
+    ref?: RefObject<HTMLDivElement | null>;
 }
 
-export const Editor = memo(
-    forwardRef<HTMLDivElement | null, EditorProps>(function Editor(
-        { disabled, placeholder, leftComponent, rightComponent }: EditorProps,
-        ref,
-    ) {
-        const isExpanded = useIsExpanded(ref as RefObject<HTMLDivElement | null>, HEIGHT_BREAKING_POINT);
-        const { onFocus, onBlur, onInput } = useSelection();
+export const Editor = memo(function Editor({ disabled, placeholder, leftComponent, rightComponent, ref }: EditorProps) {
+    const isExpanded = useIsExpanded(ref, HEIGHT_BREAKING_POINT);
+    const { onFocus, onBlur, onInput } = useSelection();
 
-        return (
-            <div
-                data-testid="WysiwygComposerEditor"
-                className="mx_WysiwygComposer_Editor"
-                data-is-expanded={isExpanded}
-            >
-                {leftComponent}
-                <div className="mx_WysiwygComposer_Editor_container">
-                    <div
-                        className={classNames("mx_WysiwygComposer_Editor_content", {
-                            mx_WysiwygComposer_Editor_content_placeholder: Boolean(placeholder),
-                        })}
-                        style={{ "--placeholder": `"${placeholder}"` } as CSSProperties}
-                        ref={ref}
-                        contentEditable={!disabled}
-                        role="textbox"
-                        aria-multiline="true"
-                        aria-autocomplete="list"
-                        aria-haspopup="listbox"
-                        dir="auto"
-                        aria-disabled={disabled}
-                        onFocus={onFocus}
-                        onBlur={onBlur}
-                        onInput={onInput}
-                    />
-                </div>
-                {rightComponent}
+    return (
+        <div data-testid="WysiwygComposerEditor" className="mx_WysiwygComposer_Editor" data-is-expanded={isExpanded}>
+            {leftComponent}
+            <div className="mx_WysiwygComposer_Editor_container">
+                <div
+                    className={classNames("mx_WysiwygComposer_Editor_content", {
+                        mx_WysiwygComposer_Editor_content_placeholder: Boolean(placeholder),
+                    })}
+                    style={{ "--placeholder": `"${placeholder}"` } as CSSProperties}
+                    ref={ref}
+                    contentEditable={!disabled}
+                    role="textbox"
+                    aria-multiline="true"
+                    aria-autocomplete="list"
+                    aria-haspopup="listbox"
+                    dir="auto"
+                    aria-disabled={disabled}
+                    onFocus={onFocus}
+                    onBlur={onBlur}
+                    onInput={onInput}
+                />
             </div>
-        );
-    }),
-);
+            {rightComponent}
+        </div>
+    );
+});
diff --git a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
index 56ac579035..9446a32a7b 100644
--- a/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.tsx
+++ b/src/components/views/rooms/wysiwyg_composer/components/WysiwygAutocomplete.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 ForwardedRef, forwardRef, type FunctionComponent } from "react";
+import React, { type JSX, type Ref, type FunctionComponent } from "react";
 import { type FormattingFunctions, type MappedSuggestion } from "@vector-im/matrix-wysiwyg";
 import { logger } from "matrix-js-sdk/src/logger";
 
@@ -39,6 +39,8 @@ interface WysiwygAutocompleteProps {
      * Handler purely for the at-room mentions special case
      */
     handleAtRoomMention: FormattingFunctions["mentionAtRoom"];
+
+    ref?: Ref<Autocomplete>;
 }
 
 /**
@@ -48,69 +50,70 @@ interface WysiwygAutocompleteProps {
  *
  * @param props.ref - the ref will be attached to the rendered `<Autocomplete />` component
  */
-const WysiwygAutocomplete = forwardRef(
-    (
-        { suggestion, handleMention, handleCommand, handleAtRoomMention }: WysiwygAutocompleteProps,
-        ref: ForwardedRef<Autocomplete>,
-    ): JSX.Element | null => {
-        const { room } = useScopedRoomContext("room");
-        const client = useMatrixClientContext();
+const WysiwygAutocomplete = ({
+    suggestion,
+    handleMention,
+    handleCommand,
+    handleAtRoomMention,
+    ref,
+}: WysiwygAutocompleteProps): JSX.Element | null => {
+    const { room } = useScopedRoomContext("room");
+    const client = useMatrixClientContext();
 
-        function handleConfirm(completion: ICompletion): void {
-            if (client === undefined || room === undefined) {
-                return;
-            }
-
-            switch (completion.type) {
-                case "command": {
-                    // TODO determine if utils in SlashCommands.tsx are required.
-                    // Trim the completion as some include trailing spaces, but we always insert a
-                    // trailing space in the rust model anyway
-                    handleCommand(completion.completion.trim());
-                    return;
-                }
-                case "at-room": {
-                    handleAtRoomMention(getMentionAttributes(completion, client, room));
-                    return;
-                }
-                case "room":
-                case "user": {
-                    if (typeof completion.href === "string") {
-                        handleMention(
-                            completion.href,
-                            getMentionDisplayText(completion, client),
-                            getMentionAttributes(completion, client, room),
-                        );
-                    }
-                    return;
-                }
-                // TODO - handle "community" type
-                default:
-                    return;
-            }
+    function handleConfirm(completion: ICompletion): void {
+        if (client === undefined || room === undefined) {
+            return;
         }
 
-        if (!room) return null;
+        switch (completion.type) {
+            case "command": {
+                // TODO determine if utils in SlashCommands.tsx are required.
+                // Trim the completion as some include trailing spaces, but we always insert a
+                // trailing space in the rust model anyway
+                handleCommand(completion.completion.trim());
+                return;
+            }
+            case "at-room": {
+                handleAtRoomMention(getMentionAttributes(completion, client, room));
+                return;
+            }
+            case "room":
+            case "user": {
+                if (typeof completion.href === "string") {
+                    handleMention(
+                        completion.href,
+                        getMentionDisplayText(completion, client),
+                        getMentionAttributes(completion, client, room),
+                    );
+                }
+                return;
+            }
+            // TODO - handle "community" type
+            default:
+                return;
+        }
+    }
 
-        const autoCompleteQuery = buildQuery(suggestion);
-        // debug for https://github.com/vector-im/element-web/issues/26037
-        logger.log(`## 26037 ## Rendering Autocomplete for WysiwygAutocomplete with query: "${autoCompleteQuery}"`);
+    if (!room) return null;
 
-        // TODO - determine if we show all of the /command suggestions, there are some options in the
-        // list which don't seem to make sense in this context, specifically /html and /plain
-        return (
-            <div className="mx_WysiwygComposer_AutoCompleteWrapper" data-testid="autocomplete-wrapper">
-                <Autocomplete
-                    ref={ref}
-                    query={autoCompleteQuery}
-                    onConfirm={handleConfirm}
-                    selection={{ start: 0, end: 0 }}
-                    room={room}
-                />
-            </div>
-        );
-    },
-);
+    const autoCompleteQuery = buildQuery(suggestion);
+    // debug for https://github.com/vector-im/element-web/issues/26037
+    logger.log(`## 26037 ## Rendering Autocomplete for WysiwygAutocomplete with query: "${autoCompleteQuery}"`);
+
+    // TODO - determine if we show all of the /command suggestions, there are some options in the
+    // list which don't seem to make sense in this context, specifically /html and /plain
+    return (
+        <div className="mx_WysiwygComposer_AutoCompleteWrapper" data-testid="autocomplete-wrapper">
+            <Autocomplete
+                ref={ref}
+                query={autoCompleteQuery}
+                onConfirm={handleConfirm}
+                selection={{ start: 0, end: 0 }}
+                room={room}
+            />
+        </div>
+    );
+};
 
 (WysiwygAutocomplete as FunctionComponent).displayName = "WysiwygAutocomplete";
 
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useIsExpanded.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useIsExpanded.ts
index 0041cac557..d5f9850277 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useIsExpanded.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useIsExpanded.ts
@@ -8,10 +8,10 @@ Please see LICENSE files in the repository root for full details.
 
 import { type RefObject, useEffect, useState } from "react";
 
-export function useIsExpanded(ref: RefObject<HTMLElement | null>, breakingPoint: number): boolean {
+export function useIsExpanded(ref: RefObject<HTMLElement | null> | undefined, breakingPoint: number): boolean {
     const [isExpanded, setIsExpanded] = useState(false);
     useEffect(() => {
-        if (ref.current) {
+        if (ref?.current) {
             const editor = ref.current;
             const resizeObserver = new ResizeObserver((entries) => {
                 requestAnimationFrame(() => {
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygEditActionHandler.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygEditActionHandler.ts
index 68d38eebcd..c105996a05 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygEditActionHandler.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygEditActionHandler.ts
@@ -22,7 +22,7 @@ import { useScopedRoomContext } from "../../../../../contexts/ScopedRoomContext.
 
 export function useWysiwygEditActionHandler(
     disabled: boolean,
-    composerElement: RefObject<HTMLElement>,
+    composerElement: RefObject<HTMLElement | null> | undefined,
     composerFunctions: ComposerFunctions,
 ): void {
     const roomContext = useScopedRoomContext("timelineRenderingType");
@@ -33,7 +33,7 @@ export function useWysiwygEditActionHandler(
         (payload: ActionPayload) => {
             // don't let the user into the composer if it is disabled - all of these branches lead
             // to the cursor being in the composer
-            if (disabled || !composerElement.current) return;
+            if (disabled || !composerElement?.current) return;
 
             const context = payload.context ?? TimelineRenderingType.Room;
 
diff --git a/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygSendActionHandler.ts b/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygSendActionHandler.ts
index 89379db1ad..fcab8f4547 100644
--- a/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygSendActionHandler.ts
+++ b/src/components/views/rooms/wysiwyg_composer/hooks/useWysiwygSendActionHandler.ts
@@ -22,7 +22,7 @@ import { useScopedRoomContext } from "../../../../../contexts/ScopedRoomContext.
 
 export function useWysiwygSendActionHandler(
     disabled: boolean,
-    composerElement: RefObject<HTMLElement>,
+    composerElement: RefObject<HTMLElement | null> | undefined,
     composerFunctions: ComposerFunctions,
 ): void {
     const roomContext = useScopedRoomContext("timelineRenderingType");
diff --git a/src/components/views/settings/CrossSigningPanel.tsx b/src/components/views/settings/CrossSigningPanel.tsx
deleted file mode 100644
index 8b72815cb9..0000000000
--- a/src/components/views/settings/CrossSigningPanel.tsx
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2019, 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, { type JSX } from "react";
-import { ClientEvent, type EmptyObject, type MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { logger } from "matrix-js-sdk/src/logger";
-import { CryptoEvent } from "matrix-js-sdk/src/crypto-api";
-
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { _t } from "../../../languageHandler";
-import Modal from "../../../Modal";
-import Spinner from "../elements/Spinner";
-import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog";
-import ConfirmDestroyCrossSigningDialog from "../dialogs/security/ConfirmDestroyCrossSigningDialog";
-import SetupEncryptionDialog from "../dialogs/security/SetupEncryptionDialog";
-import { accessSecretStorage, withSecretStorageKeyCache } from "../../../SecurityManager";
-import AccessibleButton from "../elements/AccessibleButton";
-import { SettingsSubsectionText } from "./shared/SettingsSubsection";
-
-interface IState {
-    error: boolean;
-    crossSigningPublicKeysOnDevice?: boolean;
-    crossSigningPrivateKeysInStorage?: boolean;
-    masterPrivateKeyCached?: boolean;
-    selfSigningPrivateKeyCached?: boolean;
-    userSigningPrivateKeyCached?: boolean;
-    homeserverSupportsCrossSigning?: boolean;
-    crossSigningReady?: boolean;
-}
-
-export default class CrossSigningPanel extends React.PureComponent<EmptyObject, IState> {
-    private unmounted = false;
-
-    public constructor(props: EmptyObject) {
-        super(props);
-
-        this.state = {
-            error: false,
-        };
-    }
-
-    public componentDidMount(): void {
-        this.unmounted = false;
-        const cli = MatrixClientPeg.safeGet();
-        cli.on(ClientEvent.AccountData, this.onAccountData);
-        cli.on(CryptoEvent.UserTrustStatusChanged, this.onStatusChanged);
-        cli.on(CryptoEvent.KeysChanged, this.onStatusChanged);
-        this.getUpdatedStatus();
-    }
-
-    public componentWillUnmount(): void {
-        this.unmounted = true;
-        const cli = MatrixClientPeg.get();
-        if (!cli) return;
-        cli.removeListener(ClientEvent.AccountData, this.onAccountData);
-        cli.removeListener(CryptoEvent.UserTrustStatusChanged, this.onStatusChanged);
-        cli.removeListener(CryptoEvent.KeysChanged, this.onStatusChanged);
-    }
-
-    private onAccountData = (event: MatrixEvent): void => {
-        const type = event.getType();
-        if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) {
-            this.getUpdatedStatus();
-        }
-    };
-
-    private onBootstrapClick = (): void => {
-        if (this.state.crossSigningPrivateKeysInStorage) {
-            Modal.createDialog(SetupEncryptionDialog, {}, undefined, /* priority = */ false, /* static = */ true);
-        } else {
-            // Trigger the flow to set up secure backup, which is what this will do when in
-            // the appropriate state.
-            accessSecretStorage();
-        }
-    };
-
-    private onStatusChanged = (): void => {
-        this.getUpdatedStatus();
-    };
-
-    private async getUpdatedStatus(): Promise<void> {
-        const cli = MatrixClientPeg.safeGet();
-        const crypto = cli.getCrypto();
-        if (!crypto) return;
-
-        const crossSigningStatus = await crypto.getCrossSigningStatus();
-        const crossSigningPublicKeysOnDevice = crossSigningStatus.publicKeysOnDevice;
-        const crossSigningPrivateKeysInStorage = crossSigningStatus.privateKeysInSecretStorage;
-        const masterPrivateKeyCached = crossSigningStatus.privateKeysCachedLocally.masterKey;
-        const selfSigningPrivateKeyCached = crossSigningStatus.privateKeysCachedLocally.selfSigningKey;
-        const userSigningPrivateKeyCached = crossSigningStatus.privateKeysCachedLocally.userSigningKey;
-        const homeserverSupportsCrossSigning =
-            await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing");
-        const crossSigningReady = await crypto.isCrossSigningReady();
-
-        this.setState({
-            crossSigningPublicKeysOnDevice,
-            crossSigningPrivateKeysInStorage,
-            masterPrivateKeyCached,
-            selfSigningPrivateKeyCached,
-            userSigningPrivateKeyCached,
-            homeserverSupportsCrossSigning,
-            crossSigningReady,
-        });
-    }
-
-    /**
-     * Reset the user's cross-signing keys.
-     */
-    private async resetCrossSigning(): Promise<void> {
-        this.setState({ error: false });
-        try {
-            const cli = MatrixClientPeg.safeGet();
-            await withSecretStorageKeyCache(async () => {
-                await cli.getCrypto()!.bootstrapCrossSigning({
-                    authUploadDeviceSigningKeys: async (makeRequest): Promise<void> => {
-                        const { finished } = Modal.createDialog(InteractiveAuthDialog, {
-                            title: _t("encryption|bootstrap_title"),
-                            matrixClient: cli,
-                            makeRequest,
-                        });
-                        const [confirmed] = await finished;
-                        if (!confirmed) {
-                            throw new Error("Cross-signing key upload auth canceled");
-                        }
-                    },
-                    setupNewCrossSigning: true,
-                });
-            });
-        } catch (e) {
-            this.setState({ error: true });
-            logger.error("Error bootstrapping cross-signing", e);
-        }
-        if (this.unmounted) return;
-        this.getUpdatedStatus();
-    }
-
-    /**
-     * Callback for when the user clicks the "reset cross signing" button.
-     *
-     * Shows a confirmation dialog, and then does the reset if confirmed.
-     */
-    private onResetCrossSigningClick = (): void => {
-        Modal.createDialog(ConfirmDestroyCrossSigningDialog, {
-            onFinished: async (act) => {
-                if (!act) return;
-                this.resetCrossSigning();
-            },
-        });
-    };
-
-    public render(): React.ReactNode {
-        const {
-            error,
-            crossSigningPublicKeysOnDevice,
-            crossSigningPrivateKeysInStorage,
-            masterPrivateKeyCached,
-            selfSigningPrivateKeyCached,
-            userSigningPrivateKeyCached,
-            homeserverSupportsCrossSigning,
-            crossSigningReady,
-        } = this.state;
-
-        let errorSection;
-        if (error) {
-            errorSection = <div className="error">{error.toString()}</div>;
-        }
-
-        let summarisedStatus;
-        if (homeserverSupportsCrossSigning === undefined) {
-            summarisedStatus = <Spinner />;
-        } else if (!homeserverSupportsCrossSigning) {
-            summarisedStatus = (
-                <SettingsSubsectionText data-testid="summarised-status">
-                    {_t("encryption|cross_signing_unsupported")}
-                </SettingsSubsectionText>
-            );
-        } else if (crossSigningReady && crossSigningPrivateKeysInStorage) {
-            summarisedStatus = (
-                <SettingsSubsectionText data-testid="summarised-status">
-                    ✅ {_t("encryption|cross_signing_ready")}
-                </SettingsSubsectionText>
-            );
-        } else if (crossSigningReady && !crossSigningPrivateKeysInStorage) {
-            summarisedStatus = (
-                <SettingsSubsectionText data-testid="summarised-status">
-                    ⚠️ {_t("encryption|cross_signing_ready_no_backup")}
-                </SettingsSubsectionText>
-            );
-        } else if (crossSigningPrivateKeysInStorage) {
-            summarisedStatus = (
-                <SettingsSubsectionText data-testid="summarised-status">
-                    {_t("encryption|cross_signing_untrusted")}
-                </SettingsSubsectionText>
-            );
-        } else {
-            summarisedStatus = (
-                <SettingsSubsectionText data-testid="summarised-status">
-                    {_t("encryption|cross_signing_not_ready")}
-                </SettingsSubsectionText>
-            );
-        }
-
-        const keysExistAnywhere =
-            crossSigningPublicKeysOnDevice ||
-            crossSigningPrivateKeysInStorage ||
-            masterPrivateKeyCached ||
-            selfSigningPrivateKeyCached ||
-            userSigningPrivateKeyCached;
-        const keysExistEverywhere =
-            crossSigningPublicKeysOnDevice &&
-            crossSigningPrivateKeysInStorage &&
-            masterPrivateKeyCached &&
-            selfSigningPrivateKeyCached &&
-            userSigningPrivateKeyCached;
-
-        const actions: JSX.Element[] = [];
-
-        // TODO: determine how better to expose this to users in addition to prompts at login/toast
-        if (!keysExistEverywhere && homeserverSupportsCrossSigning) {
-            let buttonCaption = _t("encryption|set_up_toast_title");
-            if (crossSigningPrivateKeysInStorage) {
-                buttonCaption = _t("encryption|verify_toast_title");
-            }
-            actions.push(
-                <AccessibleButton key="setup" kind="primary_outline" onClick={this.onBootstrapClick}>
-                    {buttonCaption}
-                </AccessibleButton>,
-            );
-        }
-
-        if (keysExistAnywhere) {
-            actions.push(
-                <AccessibleButton key="reset" kind="danger_outline" onClick={this.onResetCrossSigningClick}>
-                    {_t("action|reset")}
-                </AccessibleButton>,
-            );
-        }
-
-        let actionRow;
-        if (actions.length) {
-            actionRow = <div className="mx_CrossSigningPanel_buttonRow">{actions}</div>;
-        }
-
-        return (
-            <>
-                {summarisedStatus}
-                <details>
-                    <summary className="mx_CrossSigningPanel_advanced">{_t("common|advanced")}</summary>
-                    <table className="mx_CrossSigningPanel_statusList">
-                        <tbody>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_public_keys")}</th>
-                                <td>
-                                    {crossSigningPublicKeysOnDevice
-                                        ? _t("settings|security|cross_signing_in_memory")
-                                        : _t("settings|security|cross_signing_not_found")}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_private_keys")}</th>
-                                <td>
-                                    {crossSigningPrivateKeysInStorage
-                                        ? _t("settings|security|cross_signing_in_4s")
-                                        : _t("settings|security|cross_signing_not_in_4s")}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_master_private_Key")}</th>
-                                <td>
-                                    {masterPrivateKeyCached
-                                        ? _t("settings|security|cross_signing_cached")
-                                        : _t("settings|security|cross_signing_not_cached")}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_self_signing_private_key")}</th>
-                                <td>
-                                    {selfSigningPrivateKeyCached
-                                        ? _t("settings|security|cross_signing_cached")
-                                        : _t("settings|security|cross_signing_not_cached")}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_user_signing_private_key")}</th>
-                                <td>
-                                    {userSigningPrivateKeyCached
-                                        ? _t("settings|security|cross_signing_cached")
-                                        : _t("settings|security|cross_signing_not_cached")}
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|cross_signing_homeserver_support")}</th>
-                                <td>
-                                    {homeserverSupportsCrossSigning
-                                        ? _t("settings|security|cross_signing_homeserver_support_exists")
-                                        : _t("settings|security|cross_signing_not_found")}
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </details>
-                {errorSection}
-                {actionRow}
-            </>
-        );
-    }
-}
diff --git a/src/components/views/settings/CryptographyPanel.tsx b/src/components/views/settings/CryptographyPanel.tsx
deleted file mode 100644
index 8207fa9e5c..0000000000
--- a/src/components/views/settings/CryptographyPanel.tsx
+++ /dev/null
@@ -1,146 +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, { type JSX, lazy } from "react";
-import { logger } from "matrix-js-sdk/src/logger";
-import { type EmptyObject } from "matrix-js-sdk/src/matrix";
-
-import { _t } from "../../../languageHandler";
-import Modal from "../../../Modal";
-import AccessibleButton from "../elements/AccessibleButton";
-import * as FormattingUtils from "../../../utils/FormattingUtils";
-import SettingsStore from "../../../settings/SettingsStore";
-import SettingsFlag from "../elements/SettingsFlag";
-import { SettingLevel } from "../../../settings/SettingLevel";
-import { SettingsSubsection, SettingsSubsectionText } from "./shared/SettingsSubsection";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-
-interface IState {
-    /** The device's base64-encoded Ed25519 identity key, or:
-     *
-     * * `undefined`: not yet loaded
-     * * `null`: encryption is not supported (or the crypto stack was not correctly initialized)
-     */
-    deviceIdentityKey: string | undefined | null;
-}
-
-export default class CryptographyPanel extends React.Component<EmptyObject, IState> {
-    public static contextType = MatrixClientContext;
-    declare public context: React.ContextType<typeof MatrixClientContext>;
-
-    public constructor(props: EmptyObject, context: React.ContextType<typeof MatrixClientContext>) {
-        super(props);
-
-        if (!context.getCrypto()) {
-            this.state = { deviceIdentityKey: null };
-        } else {
-            this.state = { deviceIdentityKey: undefined };
-        }
-    }
-
-    public componentDidMount(): void {
-        if (this.state.deviceIdentityKey === undefined) {
-            this.context
-                .getCrypto()
-                ?.getOwnDeviceKeys()
-                .then((keys) => {
-                    this.setState({ deviceIdentityKey: keys.ed25519 });
-                })
-                .catch((e) => {
-                    logger.error(`CryptographyPanel: Error fetching own device keys: ${e}`);
-                    this.setState({ deviceIdentityKey: null });
-                });
-        }
-    }
-
-    public render(): React.ReactNode {
-        const client = this.context;
-        const deviceId = client.deviceId;
-        let identityKey = this.state.deviceIdentityKey;
-        if (identityKey === undefined) {
-            // Should show a spinner here really, but since this will be very transitional, I can't be doing with the
-            // necessary styling.
-            identityKey = "...";
-        } else if (identityKey === null) {
-            identityKey = _t("encryption|not_supported");
-        } else {
-            identityKey = FormattingUtils.formatCryptoKey(identityKey);
-        }
-
-        let importExportButtons: JSX.Element | undefined;
-        if (client.getCrypto()) {
-            importExportButtons = (
-                <div className="mx_CryptographyPanel_importExportButtons">
-                    <AccessibleButton kind="primary_outline" onClick={this.onExportE2eKeysClicked}>
-                        {_t("settings|security|export_megolm_keys")}
-                    </AccessibleButton>
-                    <AccessibleButton kind="primary_outline" onClick={this.onImportE2eKeysClicked}>
-                        {_t("settings|security|import_megolm_keys")}
-                    </AccessibleButton>
-                </div>
-            );
-        }
-
-        let noSendUnverifiedSetting: JSX.Element | undefined;
-        if (SettingsStore.canSetValue("blacklistUnverifiedDevices", null, SettingLevel.DEVICE)) {
-            noSendUnverifiedSetting = (
-                <SettingsFlag
-                    name="blacklistUnverifiedDevices"
-                    level={SettingLevel.DEVICE}
-                    onChange={this.updateBlacklistDevicesFlag}
-                />
-            );
-        }
-
-        return (
-            <SettingsSubsection heading={_t("settings|security|cryptography_section")}>
-                <SettingsSubsectionText>
-                    <table className="mx_CryptographyPanel_sessionInfo">
-                        <tbody>
-                            <tr>
-                                <th scope="row">{_t("settings|security|session_id")}</th>
-                                <td>
-                                    <code>{deviceId}</code>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th scope="row">{_t("settings|security|session_key")}</th>
-                                <td>
-                                    <code>
-                                        <strong>{identityKey}</strong>
-                                    </code>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </SettingsSubsectionText>
-                {importExportButtons}
-                {noSendUnverifiedSetting}
-            </SettingsSubsection>
-        );
-    }
-
-    private onExportE2eKeysClicked = (): void => {
-        Modal.createDialog(
-            lazy(() => import("../../../async-components/views/dialogs/security/ExportE2eKeysDialog")),
-            { matrixClient: this.context },
-        );
-    };
-
-    private onImportE2eKeysClicked = (): void => {
-        Modal.createDialog(
-            lazy(() => import("../../../async-components/views/dialogs/security/ImportE2eKeysDialog")),
-            { matrixClient: this.context },
-        );
-    };
-
-    private updateBlacklistDevicesFlag = (checked: boolean): void => {
-        const crypto = this.context.getCrypto();
-        if (crypto) crypto.globalBlacklistUnverifiedDevices = checked;
-    };
-}
diff --git a/src/components/views/settings/EventIndexPanel.tsx b/src/components/views/settings/EventIndexPanel.tsx
index 2cfcd70aed..fe19aa0580 100644
--- a/src/components/views/settings/EventIndexPanel.tsx
+++ b/src/components/views/settings/EventIndexPanel.tsx
@@ -119,15 +119,14 @@ export default class EventIndexPanel extends React.Component<EmptyObject, IState
     };
 
     private confirmEventStoreReset = (): void => {
-        const { close } = Modal.createDialog(SeshatResetDialog, {
-            onFinished: async (success): Promise<void> => {
-                if (success) {
-                    await SettingsStore.setValue("enableEventIndexing", null, SettingLevel.DEVICE, false);
-                    await EventIndexPeg.deleteEventIndex();
-                    await this.onEnable();
-                    close();
-                }
-            },
+        const { finished, close } = Modal.createDialog(SeshatResetDialog);
+        finished.then(async ([success]) => {
+            if (success) {
+                await SettingsStore.setValue("enableEventIndexing", null, SettingLevel.DEVICE, false);
+                await EventIndexPeg.deleteEventIndex();
+                await this.onEnable();
+                close();
+            }
         });
     };
 
diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
index ea2123729d..43f8ab9ff6 100644
--- a/src/components/views/settings/JoinRuleSettings.tsx
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -36,6 +36,9 @@ export interface JoinRuleSettingsProps {
     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;
 }
 
 const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
@@ -45,6 +48,9 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
     onError,
     beforeChange,
     closeSettingsFn,
+    disabledOptions,
+    hiddenOptions,
+    recommendedOption,
 }) => {
     const cli = room.client;
 
@@ -147,7 +153,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
                     }
                 });
 
-                closeSettingsFn();
+                closeSettingsFn?.();
 
                 // switch to the new room in the background
                 dis.dispatch<ViewRoomPayload>({
@@ -170,18 +176,26 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
             {_t("room_settings|security|join_rule_upgrade_required")}
         </span>
     );
+    const withRecommendLabel = (label: string, rule: JoinRule): React.ReactNode =>
+        rule === recommendedOption ? (
+            <>
+                {label} (<span className="mx_JoinRuleSettings_recommended">{_t("common|recommended")}</span>)
+            </>
+        ) : (
+            label
+        );
 
     const definitions: IDefinition<JoinRule>[] = [
         {
             value: JoinRule.Invite,
-            label: _t("room_settings|security|join_rule_invite"),
+            label: withRecommendLabel(_t("room_settings|security|join_rule_invite"), JoinRule.Invite),
             description: _t("room_settings|security|join_rule_invite_description"),
             checked:
                 joinRule === JoinRule.Invite || (joinRule === JoinRule.Restricted && !restrictedAllowRoomIds?.length),
         },
         {
             value: JoinRule.Public,
-            label: _t("common|public"),
+            label: withRecommendLabel(_t("common|public"), JoinRule.Public),
             description: (
                 <>
                     {_t("room_settings|security|join_rule_public_description")}
@@ -292,7 +306,7 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
             value: JoinRule.Restricted,
             label: (
                 <>
-                    {_t("room_settings|security|join_rule_restricted")}
+                    {withRecommendLabel(_t("room_settings|security|join_rule_restricted"), JoinRule.Restricted)}
                     {preferredRestrictionVersion && upgradeRequiredPill}
                 </>
             ),
@@ -303,11 +317,11 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
     }
 
     if (askToJoinEnabled && (roomSupportsKnock || preferredKnockVersion)) {
-        definitions.push({
+        definitions.splice(Math.max(0, definitions.length - 1), 0, {
             value: JoinRule.Knock,
             label: (
                 <>
-                    {_t("room_settings|security|join_rule_knock")}
+                    {withRecommendLabel(_t("room_settings|security|join_rule_knock"), JoinRule.Knock)}
                     {preferredKnockVersion && upgradeRequiredPill}
                 </>
             ),
@@ -397,7 +411,9 @@ const JoinRuleSettings: React.FC<JoinRuleSettingsProps> = ({
             name="joinRule"
             value={joinRule}
             onChange={onChange}
-            definitions={definitions}
+            definitions={definitions
+                .map((d) => (disabledOptions?.has(d.value) ? { ...d, disabled: true } : d))
+                .filter((d) => !hiddenOptions?.has(d.value))}
             disabled={disabled}
             className="mx_JoinRuleSettings_radioButton"
         />
diff --git a/src/components/views/settings/PowerLevelSelector.tsx b/src/components/views/settings/PowerLevelSelector.tsx
index 32731715ff..0b570c1516 100644
--- a/src/components/views/settings/PowerLevelSelector.tsx
+++ b/src/components/views/settings/PowerLevelSelector.tsx
@@ -13,6 +13,8 @@ import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
 import PowerSelector from "../elements/PowerSelector";
 import { _t } from "../../../languageHandler";
 import SettingsFieldset from "./SettingsFieldset";
+import Modal from "../../../Modal";
+import QuestionDialog from "../dialogs/QuestionDialog";
 
 /**
  * Display in a fieldset, the power level of the users and allow to change them.
@@ -77,6 +79,13 @@ export function PowerLevelSelector({
     // No user to display, we return the children into fragment to convert it to JSX.Element type
     if (!users.length) return <>{children}</>;
 
+    // check at least one admin in the list
+    const roomHasAtLeastOneAdmin = (usersLevels: Record<string, number>): boolean => {
+        const userLevelValues = Object.values(usersLevels);
+        // At least one user as the pL 100 which means he is admin
+        return userLevelValues.some((uL) => uL === 100);
+    };
+
     return (
         <SettingsFieldset legend={title}>
             {users.map((userId) => {
@@ -96,7 +105,24 @@ export function PowerLevelSelector({
                         disabled={!canChange}
                         label={userId}
                         key={userId}
-                        onChange={(value) => setCurrentPowerLevel({ value, userId })}
+                        onChange={async (value) => {
+                            const userLevelsTmp = Object.assign({}, userLevels);
+                            userLevelsTmp[userId] = value;
+                            if (!roomHasAtLeastOneAdmin(userLevelsTmp)) {
+                                const { finished } = Modal.createDialog(QuestionDialog, {
+                                    title: _t("common|warning"),
+                                    description: <div>{_t("user_info|demote_self_confirm_room")}</div>,
+                                    button: _t("action|continue"),
+                                });
+                                const [confirmed] = await finished;
+                                if (!confirmed) {
+                                    // if cancel, we reput initial value
+                                    setCurrentPowerLevel({ value: userLevels[userId], userId });
+                                    return;
+                                }
+                            }
+                            setCurrentPowerLevel({ value, userId });
+                        }}
                     />
                 );
             })}
diff --git a/src/components/views/settings/SecureBackupPanel.tsx b/src/components/views/settings/SecureBackupPanel.tsx
deleted file mode 100644
index 492ed8af64..0000000000
--- a/src/components/views/settings/SecureBackupPanel.tsx
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
-Copyright 2018 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, { lazy, type JSX, type ReactNode } from "react";
-import { CryptoEvent, type BackupTrustInfo, type KeyBackupInfo } from "matrix-js-sdk/src/crypto-api";
-import { logger } from "matrix-js-sdk/src/logger";
-import { type EmptyObject } from "matrix-js-sdk/src/matrix";
-
-import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { _t } from "../../../languageHandler";
-import Modal from "../../../Modal";
-import { isSecureBackupRequired } from "../../../utils/WellKnownUtils";
-import Spinner from "../elements/Spinner";
-import AccessibleButton from "../elements/AccessibleButton";
-import QuestionDialog from "../dialogs/QuestionDialog";
-import RestoreKeyBackupDialog from "../dialogs/security/RestoreKeyBackupDialog";
-import { accessSecretStorage } from "../../../SecurityManager";
-import { SettingsSubsectionText } from "./shared/SettingsSubsection";
-
-interface IState {
-    loading: boolean;
-    error: boolean;
-    backupKeyStored: boolean | null;
-    backupKeyCached: boolean | null;
-    backupKeyWellFormed: boolean | null;
-    secretStorageKeyInAccount: boolean | null;
-    secretStorageReady: boolean | null;
-
-    /** Information on the current key backup version, as returned by the server.
-     *
-     * `null` could mean any of:
-     *    * we haven't yet requested the data from the server.
-     *    * we were unable to reach the server.
-     *    * the server returned key backup version data we didn't understand or was malformed.
-     *    * there is actually no backup on the server.
-     */
-    backupInfo: KeyBackupInfo | null;
-
-    /**
-     * Information on whether the backup in `backupInfo` is correctly signed, and whether we have the right key to
-     * decrypt it.
-     *
-     * `undefined` if `backupInfo` is null, or if crypto is not enabled in the client.
-     */
-    backupTrustInfo: BackupTrustInfo | undefined;
-
-    /**
-     * If key backup is currently enabled, the backup version we are backing up to.
-     */
-    activeBackupVersion: string | null;
-
-    /**
-     * Number of sessions remaining to be backed up. `null` if we have no information on this.
-     */
-    sessionsRemaining: number | null;
-}
-
-export default class SecureBackupPanel extends React.PureComponent<EmptyObject, IState> {
-    private unmounted = false;
-
-    public constructor(props: EmptyObject) {
-        super(props);
-
-        this.state = {
-            loading: true,
-            error: false,
-            backupKeyStored: null,
-            backupKeyCached: null,
-            backupKeyWellFormed: null,
-            secretStorageKeyInAccount: null,
-            secretStorageReady: null,
-            backupInfo: null,
-            backupTrustInfo: undefined,
-            activeBackupVersion: null,
-            sessionsRemaining: null,
-        };
-    }
-
-    public componentDidMount(): void {
-        this.unmounted = false;
-        this.loadBackupStatus();
-
-        MatrixClientPeg.safeGet().on(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
-        MatrixClientPeg.safeGet().on(CryptoEvent.KeyBackupSessionsRemaining, this.onKeyBackupSessionsRemaining);
-    }
-
-    public componentWillUnmount(): void {
-        this.unmounted = true;
-
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get()!.removeListener(CryptoEvent.KeyBackupStatus, this.onKeyBackupStatus);
-            MatrixClientPeg.get()!.removeListener(
-                CryptoEvent.KeyBackupSessionsRemaining,
-                this.onKeyBackupSessionsRemaining,
-            );
-        }
-    }
-
-    private onKeyBackupSessionsRemaining = (sessionsRemaining: number): void => {
-        this.setState({
-            sessionsRemaining,
-        });
-    };
-
-    private onKeyBackupStatus = (): void => {
-        // This just loads the current backup status rather than forcing
-        // a re-check otherwise we risk causing infinite loops
-        this.loadBackupStatus();
-    };
-
-    private async loadBackupStatus(): Promise<void> {
-        this.setState({ loading: true });
-        this.getUpdatedDiagnostics();
-        try {
-            const cli = MatrixClientPeg.safeGet();
-            const backupInfo = (await cli.getCrypto()?.getKeyBackupInfo()) ?? null;
-            const backupTrustInfo = backupInfo ? await cli.getCrypto()?.isKeyBackupTrusted(backupInfo) : undefined;
-
-            const activeBackupVersion = (await cli.getCrypto()?.getActiveSessionBackupVersion()) ?? null;
-
-            if (this.unmounted) return;
-            this.setState({
-                loading: false,
-                error: false,
-                backupInfo,
-                backupTrustInfo,
-                activeBackupVersion,
-            });
-        } catch (e) {
-            logger.log("Unable to fetch key backup status", e);
-            if (this.unmounted) return;
-            this.setState({
-                loading: false,
-                error: true,
-                backupInfo: null,
-                backupTrustInfo: undefined,
-                activeBackupVersion: null,
-            });
-        }
-    }
-
-    private async getUpdatedDiagnostics(): Promise<void> {
-        const cli = MatrixClientPeg.safeGet();
-        const crypto = cli.getCrypto();
-        if (!crypto) return;
-
-        const secretStorage = cli.secretStorage;
-
-        const backupKeyStored = !!(await cli.isKeyBackupKeyStored());
-        const backupKeyFromCache = await crypto.getSessionBackupPrivateKey();
-        const backupKeyCached = !!backupKeyFromCache;
-        const backupKeyWellFormed = backupKeyFromCache instanceof Uint8Array;
-        const secretStorageKeyInAccount = await secretStorage.hasKey();
-        const secretStorageReady = await crypto.isSecretStorageReady();
-
-        if (this.unmounted) return;
-        this.setState({
-            backupKeyStored,
-            backupKeyCached,
-            backupKeyWellFormed,
-            secretStorageKeyInAccount,
-            secretStorageReady,
-        });
-    }
-
-    private startNewBackup = (): void => {
-        Modal.createDialog(
-            lazy(() => import("../../../async-components/views/dialogs/security/CreateKeyBackupDialog")),
-            {
-                onFinished: () => {
-                    this.loadBackupStatus();
-                },
-            },
-            undefined,
-            /* priority = */ false,
-            /* static = */ true,
-        );
-    };
-
-    private deleteBackup = (): void => {
-        Modal.createDialog(QuestionDialog, {
-            title: _t("settings|security|delete_backup"),
-            description: _t("settings|security|delete_backup_confirm_description"),
-            button: _t("settings|security|delete_backup"),
-            danger: true,
-            onFinished: (proceed) => {
-                if (!proceed) return;
-                this.setState({ loading: true });
-                const versionToDelete = this.state.backupInfo!.version!;
-                // deleteKeyBackupVersion fires a key backup status event
-                // which will update the UI
-                MatrixClientPeg.safeGet().getCrypto()?.deleteKeyBackupVersion(versionToDelete);
-            },
-        });
-    };
-
-    private restoreBackup = async (): Promise<void> => {
-        Modal.createDialog(RestoreKeyBackupDialog, undefined, undefined, /* priority = */ false, /* static = */ true);
-    };
-
-    private resetSecretStorage = async (): Promise<void> => {
-        this.setState({ error: false });
-        try {
-            await accessSecretStorage(async (): Promise<void> => {}, { forceReset: true });
-        } catch (e) {
-            logger.error("Error resetting secret storage", e);
-            if (this.unmounted) return;
-            this.setState({ error: true });
-        }
-        if (this.unmounted) return;
-        this.loadBackupStatus();
-    };
-
-    public render(): React.ReactNode {
-        const {
-            loading,
-            error,
-            backupKeyStored,
-            backupKeyCached,
-            backupKeyWellFormed,
-            secretStorageKeyInAccount,
-            secretStorageReady,
-            backupInfo,
-            backupTrustInfo,
-            sessionsRemaining,
-        } = this.state;
-
-        let statusDescription: JSX.Element;
-        let extraDetailsTableRows: JSX.Element | undefined;
-        let extraDetails: JSX.Element | undefined;
-        const actions: JSX.Element[] = [];
-        if (error) {
-            statusDescription = (
-                <SettingsSubsectionText className="error">
-                    {_t("settings|security|error_loading_key_backup_status")}
-                </SettingsSubsectionText>
-            );
-        } else if (loading) {
-            statusDescription = <Spinner />;
-        } else if (backupInfo) {
-            let restoreButtonCaption = _t("settings|security|restore_key_backup");
-
-            if (this.state.activeBackupVersion !== null) {
-                statusDescription = (
-                    <SettingsSubsectionText>✅ {_t("settings|security|key_backup_active")}</SettingsSubsectionText>
-                );
-            } else {
-                statusDescription = (
-                    <>
-                        <SettingsSubsectionText>
-                            {_t("settings|security|key_backup_inactive", {}, { b: (sub) => <strong>{sub}</strong> })}
-                        </SettingsSubsectionText>
-                        <SettingsSubsectionText>
-                            {_t("settings|security|key_backup_connect_prompt")}
-                        </SettingsSubsectionText>
-                    </>
-                );
-                restoreButtonCaption = _t("settings|security|key_backup_connect");
-            }
-
-            let uploadStatus: ReactNode;
-            if (sessionsRemaining === null) {
-                // No upload status to show when backup disabled.
-                uploadStatus = "";
-            } else if (sessionsRemaining > 0) {
-                uploadStatus = (
-                    <div>
-                        {_t("settings|security|key_backup_in_progress", { sessionsRemaining })} <br />
-                    </div>
-                );
-            } else {
-                uploadStatus = (
-                    <div>
-                        {_t("settings|security|key_backup_complete")} <br />
-                    </div>
-                );
-            }
-
-            let trustedLocally: string | undefined;
-            if (backupTrustInfo?.matchesDecryptionKey) {
-                trustedLocally = _t("settings|security|key_backup_can_be_restored");
-            }
-
-            extraDetailsTableRows = (
-                <>
-                    <tr>
-                        <th scope="row">{_t("settings|security|key_backup_latest_version")}</th>
-                        <td>
-                            {backupInfo.version} ({_t("settings|security|key_backup_algorithm")}{" "}
-                            <code>{backupInfo.algorithm}</code>)
-                        </td>
-                    </tr>
-                    <tr>
-                        <th scope="row">{_t("settings|security|key_backup_active_version")}</th>
-                        <td>
-                            {this.state.activeBackupVersion === null
-                                ? _t("settings|security|key_backup_active_version_none")
-                                : this.state.activeBackupVersion}
-                        </td>
-                    </tr>
-                </>
-            );
-
-            extraDetails = (
-                <>
-                    {uploadStatus}
-                    <div>{trustedLocally}</div>
-                </>
-            );
-
-            actions.push(
-                <AccessibleButton key="restore" kind="primary_outline" onClick={this.restoreBackup}>
-                    {restoreButtonCaption}
-                </AccessibleButton>,
-            );
-
-            if (!isSecureBackupRequired(MatrixClientPeg.safeGet())) {
-                actions.push(
-                    <AccessibleButton key="delete" kind="danger_outline" onClick={this.deleteBackup}>
-                        {_t("settings|security|delete_backup")}
-                    </AccessibleButton>,
-                );
-            }
-        } else {
-            statusDescription = (
-                <>
-                    <SettingsSubsectionText>
-                        {_t(
-                            "settings|security|key_backup_inactive_warning",
-                            {},
-                            { b: (sub) => <strong>{sub}</strong> },
-                        )}
-                    </SettingsSubsectionText>
-                    <SettingsSubsectionText>{_t("encryption|setup_secure_backup|explainer")}</SettingsSubsectionText>
-                </>
-            );
-            actions.push(
-                <AccessibleButton key="setup" kind="primary_outline" onClick={this.startNewBackup}>
-                    {_t("encryption|setup_secure_backup|title")}
-                </AccessibleButton>,
-            );
-        }
-
-        if (secretStorageKeyInAccount) {
-            actions.push(
-                <AccessibleButton key="reset" kind="danger_outline" onClick={this.resetSecretStorage}>
-                    {_t("action|reset")}
-                </AccessibleButton>,
-            );
-        }
-
-        let backupKeyWellFormedText = "";
-        if (backupKeyCached) {
-            backupKeyWellFormedText = ", ";
-            if (backupKeyWellFormed) {
-                backupKeyWellFormedText += _t("settings|security|backup_key_well_formed");
-            } else {
-                backupKeyWellFormedText += _t("settings|security|backup_key_unexpected_type");
-            }
-        }
-
-        let actionRow: JSX.Element | undefined;
-        if (actions.length) {
-            actionRow = <div className="mx_SecureBackupPanel_buttonRow">{actions}</div>;
-        }
-
-        return (
-            <>
-                <SettingsSubsectionText>{_t("settings|security|backup_keys_description")}</SettingsSubsectionText>
-                {statusDescription}
-                <details>
-                    <summary className="mx_SecureBackupPanel_advanced">{_t("common|advanced")}</summary>
-                    <table className="mx_SecureBackupPanel_statusList">
-                        <tr>
-                            <th scope="row">{_t("settings|security|backup_key_stored_status")}</th>
-                            <td>
-                                {backupKeyStored === true
-                                    ? _t("settings|security|cross_signing_in_4s")
-                                    : _t("settings|security|cross_signing_not_stored")}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th scope="row">{_t("settings|security|backup_key_cached_status")}</th>
-                            <td>
-                                {backupKeyCached
-                                    ? _t("settings|security|cross_signing_cached")
-                                    : _t("settings|security|cross_signing_not_cached")}
-                                {backupKeyWellFormedText}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th scope="row">{_t("settings|security|4s_public_key_status")}</th>
-                            <td>
-                                {secretStorageKeyInAccount
-                                    ? _t("settings|security|4s_public_key_in_account_data")
-                                    : _t("settings|security|cross_signing_not_found")}
-                            </td>
-                        </tr>
-                        <tr>
-                            <th scope="row">{_t("settings|security|secret_storage_status")}</th>
-                            <td>
-                                {secretStorageReady
-                                    ? _t("settings|security|secret_storage_ready")
-                                    : _t("settings|security|secret_storage_not_ready")}
-                            </td>
-                        </tr>
-                        {extraDetailsTableRows}
-                    </table>
-                    {extraDetails}
-                </details>
-                {actionRow}
-            </>
-        );
-    }
-}
diff --git a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
index 507fc31425..dfa188cf69 100644
--- a/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
+++ b/src/components/views/settings/devices/DeviceExpandDetailsButton.tsx
@@ -15,7 +15,7 @@ import AccessibleButton, { type ButtonProps } from "../../elements/AccessibleBut
 
 type Props<T extends keyof HTMLElementTagNameMap> = Omit<
     ButtonProps<T>,
-    "aria-label" | "title" | "kind" | "className" | "element"
+    "aria-label" | "title" | "kind" | "className" | "element" | "ref"
 > & {
     isExpanded: boolean;
 };
diff --git a/src/components/views/settings/devices/FilteredDeviceList.tsx b/src/components/views/settings/devices/FilteredDeviceList.tsx
index c9a266e4b9..fd30091106 100644
--- a/src/components/views/settings/devices/FilteredDeviceList.tsx
+++ b/src/components/views/settings/devices/FilteredDeviceList.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 ForwardedRef, forwardRef } from "react";
+import React, { type JSX, type Ref } from "react";
 import { type IPusher, PUSHER_DEVICE_ID, type LocalNotificationSettings } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../../languageHandler";
@@ -47,6 +47,7 @@ interface Props {
      * Changes sign out button to be a manage button
      */
     delegatedAuthAccountUrl?: string;
+    ref?: Ref<HTMLDivElement>;
 }
 
 const isDeviceSelected = (
@@ -237,152 +238,148 @@ const DeviceListItem: React.FC<{
  * Filtered list of devices
  * Sorted by latest activity descending
  */
-export const FilteredDeviceList = forwardRef(
-    (
-        {
-            devices,
-            pushers,
-            localNotificationSettings,
-            filter,
-            expandedDeviceIds,
-            signingOutDeviceIds,
-            selectedDeviceIds,
-            onFilterChange,
-            onDeviceExpandToggle,
-            saveDeviceName,
-            onSignOutDevices,
-            onRequestDeviceVerification,
-            setPushNotifications,
-            setSelectedDeviceIds,
-            supportsMSC3881,
-            delegatedAuthAccountUrl,
-        }: Props,
-        ref: ForwardedRef<HTMLDivElement>,
-    ) => {
-        const sortedDevices = getFilteredSortedDevices(devices, filter);
+export const FilteredDeviceList = ({
+    devices,
+    pushers,
+    localNotificationSettings,
+    filter,
+    expandedDeviceIds,
+    signingOutDeviceIds,
+    selectedDeviceIds,
+    onFilterChange,
+    onDeviceExpandToggle,
+    saveDeviceName,
+    onSignOutDevices,
+    onRequestDeviceVerification,
+    setPushNotifications,
+    setSelectedDeviceIds,
+    supportsMSC3881,
+    delegatedAuthAccountUrl,
+    ref,
+}: Props): JSX.Element => {
+    const sortedDevices = getFilteredSortedDevices(devices, filter);
 
-        function getPusherForDevice(device: ExtendedDevice): IPusher | undefined {
-            return pushers.find((pusher) => pusher[PUSHER_DEVICE_ID.name] === device.device_id);
+    function getPusherForDevice(device: ExtendedDevice): IPusher | undefined {
+        return pushers.find((pusher) => pusher[PUSHER_DEVICE_ID.name] === device.device_id);
+    }
+
+    const toggleSelection = (deviceId: ExtendedDevice["device_id"]): void => {
+        if (isDeviceSelected(deviceId, selectedDeviceIds)) {
+            // remove from selection
+            setSelectedDeviceIds(selectedDeviceIds.filter((id) => id !== deviceId));
+        } else {
+            setSelectedDeviceIds([...selectedDeviceIds, deviceId]);
         }
+    };
 
-        const toggleSelection = (deviceId: ExtendedDevice["device_id"]): void => {
-            if (isDeviceSelected(deviceId, selectedDeviceIds)) {
-                // remove from selection
-                setSelectedDeviceIds(selectedDeviceIds.filter((id) => id !== deviceId));
-            } else {
-                setSelectedDeviceIds([...selectedDeviceIds, deviceId]);
-            }
-        };
+    const options: FilterDropdownOption<DeviceFilterKey>[] = [
+        { id: ALL_FILTER_ID, label: _t("settings|sessions|filter_all") },
+        {
+            id: DeviceSecurityVariation.Verified,
+            label: _t("common|verified"),
+            description: _t("settings|sessions|filter_verified_description"),
+        },
+        {
+            id: DeviceSecurityVariation.Unverified,
+            label: _t("common|unverified"),
+            description: _t("settings|sessions|filter_unverified_description"),
+        },
+        {
+            id: DeviceSecurityVariation.Inactive,
+            label: _t("settings|sessions|filter_inactive"),
+            description: _t("settings|sessions|filter_inactive_description", {
+                inactiveAgeDays: INACTIVE_DEVICE_AGE_DAYS,
+            }),
+        },
+    ];
 
-        const options: FilterDropdownOption<DeviceFilterKey>[] = [
-            { id: ALL_FILTER_ID, label: _t("settings|sessions|filter_all") },
-            {
-                id: DeviceSecurityVariation.Verified,
-                label: _t("common|verified"),
-                description: _t("settings|sessions|filter_verified_description"),
-            },
-            {
-                id: DeviceSecurityVariation.Unverified,
-                label: _t("common|unverified"),
-                description: _t("settings|sessions|filter_unverified_description"),
-            },
-            {
-                id: DeviceSecurityVariation.Inactive,
-                label: _t("settings|sessions|filter_inactive"),
-                description: _t("settings|sessions|filter_inactive_description", {
-                    inactiveAgeDays: INACTIVE_DEVICE_AGE_DAYS,
-                }),
-            },
-        ];
+    const onFilterOptionChange = (filterId: DeviceFilterKey): void => {
+        onFilterChange(filterId === ALL_FILTER_ID ? undefined : (filterId as FilterVariation));
+    };
 
-        const onFilterOptionChange = (filterId: DeviceFilterKey): void => {
-            onFilterChange(filterId === ALL_FILTER_ID ? undefined : (filterId as FilterVariation));
-        };
+    const isAllSelected = selectedDeviceIds.length >= sortedDevices.length;
+    const toggleSelectAll = (): void => {
+        if (isAllSelected) {
+            setSelectedDeviceIds([]);
+        } else {
+            setSelectedDeviceIds(sortedDevices.map((device) => device.device_id));
+        }
+    };
 
-        const isAllSelected = selectedDeviceIds.length >= sortedDevices.length;
-        const toggleSelectAll = (): void => {
-            if (isAllSelected) {
-                setSelectedDeviceIds([]);
-            } else {
-                setSelectedDeviceIds(sortedDevices.map((device) => device.device_id));
-            }
-        };
+    const isSigningOut = !!signingOutDeviceIds.length;
 
-        const isSigningOut = !!signingOutDeviceIds.length;
-
-        return (
-            <div className="mx_FilteredDeviceList" ref={ref}>
-                <FilteredDeviceListHeader
-                    selectedDeviceCount={selectedDeviceIds.length}
-                    isAllSelected={isAllSelected}
-                    toggleSelectAll={toggleSelectAll}
-                    isSelectDisabled={!!delegatedAuthAccountUrl}
-                >
-                    {selectedDeviceIds.length ? (
-                        <>
-                            <AccessibleButton
-                                data-testid="sign-out-selection-cta"
-                                kind="danger_inline"
-                                disabled={isSigningOut}
-                                onClick={() => onSignOutDevices(selectedDeviceIds)}
-                                className="mx_FilteredDeviceList_headerButton"
-                            >
-                                {isSigningOut && <Spinner w={16} h={16} />}
-                                {_t("action|sign_out")}
-                            </AccessibleButton>
-                            <AccessibleButton
-                                data-testid="cancel-selection-cta"
-                                kind="content_inline"
-                                disabled={isSigningOut}
-                                onClick={() => setSelectedDeviceIds([])}
-                                className="mx_FilteredDeviceList_headerButton"
-                            >
-                                {_t("action|cancel")}
-                            </AccessibleButton>
-                        </>
-                    ) : (
-                        <FilterDropdown<DeviceFilterKey>
-                            id="device-list-filter"
-                            label={_t("settings|sessions|filter_label")}
-                            value={filter || ALL_FILTER_ID}
-                            onOptionChange={onFilterOptionChange}
-                            options={options}
-                            selectedLabel={_t("action|show")}
-                        />
-                    )}
-                </FilteredDeviceListHeader>
-                {!!sortedDevices.length ? (
-                    <FilterSecurityCard filter={filter} />
+    return (
+        <div className="mx_FilteredDeviceList" ref={ref}>
+            <FilteredDeviceListHeader
+                selectedDeviceCount={selectedDeviceIds.length}
+                isAllSelected={isAllSelected}
+                toggleSelectAll={toggleSelectAll}
+                isSelectDisabled={!!delegatedAuthAccountUrl}
+            >
+                {selectedDeviceIds.length ? (
+                    <>
+                        <AccessibleButton
+                            data-testid="sign-out-selection-cta"
+                            kind="danger_inline"
+                            disabled={isSigningOut}
+                            onClick={() => onSignOutDevices(selectedDeviceIds)}
+                            className="mx_FilteredDeviceList_headerButton"
+                        >
+                            {isSigningOut && <Spinner w={16} h={16} />}
+                            {_t("action|sign_out")}
+                        </AccessibleButton>
+                        <AccessibleButton
+                            data-testid="cancel-selection-cta"
+                            kind="content_inline"
+                            disabled={isSigningOut}
+                            onClick={() => setSelectedDeviceIds([])}
+                            className="mx_FilteredDeviceList_headerButton"
+                        >
+                            {_t("action|cancel")}
+                        </AccessibleButton>
+                    </>
                 ) : (
-                    <NoResults filter={filter} clearFilter={() => onFilterChange(undefined)} />
+                    <FilterDropdown<DeviceFilterKey>
+                        id="device-list-filter"
+                        label={_t("settings|sessions|filter_label")}
+                        value={filter || ALL_FILTER_ID}
+                        onOptionChange={onFilterOptionChange}
+                        options={options}
+                        selectedLabel={_t("action|show")}
+                    />
                 )}
-                <ol className="mx_FilteredDeviceList_list">
-                    {sortedDevices.map((device) => (
-                        <DeviceListItem
-                            key={device.device_id}
-                            device={device}
-                            pusher={getPusherForDevice(device)}
-                            localNotificationSettings={localNotificationSettings.get(device.device_id)}
-                            isExpanded={expandedDeviceIds.includes(device.device_id)}
-                            isSigningOut={signingOutDeviceIds.includes(device.device_id)}
-                            isSelected={isDeviceSelected(device.device_id, selectedDeviceIds)}
-                            isSelectDisabled={!!delegatedAuthAccountUrl}
-                            onDeviceExpandToggle={() => onDeviceExpandToggle(device.device_id)}
-                            onSignOutDevice={() => onSignOutDevices([device.device_id])}
-                            saveDeviceName={(deviceName: string) => saveDeviceName(device.device_id, deviceName)}
-                            onRequestDeviceVerification={
-                                onRequestDeviceVerification
-                                    ? () => onRequestDeviceVerification(device.device_id)
-                                    : undefined
-                            }
-                            setPushNotifications={setPushNotifications}
-                            toggleSelected={() => toggleSelection(device.device_id)}
-                            supportsMSC3881={supportsMSC3881}
-                            delegatedAuthAccountUrl={delegatedAuthAccountUrl}
-                        />
-                    ))}
-                </ol>
-            </div>
-        );
-    },
-);
+            </FilteredDeviceListHeader>
+            {!!sortedDevices.length ? (
+                <FilterSecurityCard filter={filter} />
+            ) : (
+                <NoResults filter={filter} clearFilter={() => onFilterChange(undefined)} />
+            )}
+            <ol className="mx_FilteredDeviceList_list">
+                {sortedDevices.map((device) => (
+                    <DeviceListItem
+                        key={device.device_id}
+                        device={device}
+                        pusher={getPusherForDevice(device)}
+                        localNotificationSettings={localNotificationSettings.get(device.device_id)}
+                        isExpanded={expandedDeviceIds.includes(device.device_id)}
+                        isSigningOut={signingOutDeviceIds.includes(device.device_id)}
+                        isSelected={isDeviceSelected(device.device_id, selectedDeviceIds)}
+                        isSelectDisabled={!!delegatedAuthAccountUrl}
+                        onDeviceExpandToggle={() => onDeviceExpandToggle(device.device_id)}
+                        onSignOutDevice={() => onSignOutDevices([device.device_id])}
+                        saveDeviceName={(deviceName: string) => saveDeviceName(device.device_id, deviceName)}
+                        onRequestDeviceVerification={
+                            onRequestDeviceVerification
+                                ? () => onRequestDeviceVerification(device.device_id)
+                                : undefined
+                        }
+                        setPushNotifications={setPushNotifications}
+                        toggleSelected={() => toggleSelection(device.device_id)}
+                        supportsMSC3881={supportsMSC3881}
+                        delegatedAuthAccountUrl={delegatedAuthAccountUrl}
+                    />
+                ))}
+            </ol>
+        </div>
+    );
+};
diff --git a/src/components/views/settings/devices/deleteDevices.tsx b/src/components/views/settings/devices/deleteDevices.tsx
index e2fc6c1abd..894e23e0f7 100644
--- a/src/components/views/settings/devices/deleteDevices.tsx
+++ b/src/components/views/settings/devices/deleteDevices.tsx
@@ -11,7 +11,6 @@ import { type AuthDict, type IAuthData } from "matrix-js-sdk/src/interactive-aut
 
 import { _t } from "../../../../languageHandler";
 import Modal from "../../../../Modal";
-import { type InteractiveAuthCallback } from "../../../structures/InteractiveAuth";
 import { SSOAuthEntry } from "../../auth/InteractiveAuthEntryComponents";
 import InteractiveAuthDialog from "../../dialogs/InteractiveAuthDialog";
 
@@ -24,7 +23,7 @@ const makeDeleteRequest =
 export const deleteDevicesWithInteractiveAuth = async (
     matrixClient: MatrixClient,
     deviceIds: string[],
-    onFinished: InteractiveAuthCallback<void>,
+    onFinished: (success?: boolean) => Promise<void>,
 ): Promise<void> => {
     if (!deviceIds.length) {
         return;
@@ -32,7 +31,7 @@ export const deleteDevicesWithInteractiveAuth = async (
     try {
         await makeDeleteRequest(matrixClient, deviceIds)(null);
         // no interactive auth needed
-        await onFinished(true, undefined);
+        await onFinished(true);
     } catch (error) {
         if (!(error instanceof MatrixError) || error.httpStatus !== 401 || !error.data?.flows) {
             // doesn't look like an interactive-auth failure
@@ -62,16 +61,16 @@ export const deleteDevicesWithInteractiveAuth = async (
                 continueKind: "danger",
             },
         };
-        Modal.createDialog(InteractiveAuthDialog, {
+        const { finished } = Modal.createDialog(InteractiveAuthDialog, {
             title: _t("common|authentication"),
             matrixClient: matrixClient,
             authData: error.data as IAuthData,
-            onFinished,
             makeRequest: makeDeleteRequest(matrixClient, deviceIds),
             aestheticsForStagePhases: {
                 [SSOAuthEntry.LOGIN_TYPE]: dialogAesthetics,
                 [SSOAuthEntry.UNSTABLE_LOGIN_TYPE]: dialogAesthetics,
             },
         });
+        finished.then(([success]) => onFinished(success));
     }
 };
diff --git a/src/components/views/settings/encryption/ResetIdentityBody.tsx b/src/components/views/settings/encryption/ResetIdentityBody.tsx
new file mode 100644
index 0000000000..a6b0b2c12e
--- /dev/null
+++ b/src/components/views/settings/encryption/ResetIdentityBody.tsx
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2024-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 { Button, InlineSpinner, VisualList, VisualListItem } from "@vector-im/compound-web";
+import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check";
+import InfoIcon from "@vector-im/compound-design-tokens/assets/web/icons/info";
+import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
+import React, { type JSX, useState } from "react";
+
+import { _t } from "../../../../languageHandler";
+import { EncryptionCard } from "./EncryptionCard";
+import { uiAuthCallback } from "../../../../CreateCrossSigning";
+import { EncryptionCardButtons } from "./EncryptionCardButtons";
+import { EncryptionCardEmphasisedContent } from "./EncryptionCardEmphasisedContent";
+import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
+
+interface ResetIdentityBodyProps {
+    /**
+     * Called when the identity is reset.
+     */
+    onReset: () => void;
+
+    /**
+     * Called when the cancel button is clicked.
+     */
+    onCancelClick: () => void;
+
+    /**
+     * The variant of the panel to show. We show more warnings in the 'compromised' variant (no use in showing a user
+     * this warning if they have to reset because they no longer have their key)
+     */
+    variant: ResetIdentityBodyVariant;
+}
+
+/**
+ * The variant of the panel to show.  This affects the message displayed to the user.
+ *
+ * "compromised" is shown when the user chose 'Reset cryptographic identity' explicitly in settings, usually because
+ * they believe their identity has been compromised.
+ *
+ * "sync_failed" is shown when the user tried to recover their identity but the process failed, probably because
+ * the required information is missing from recovery.
+ *
+ * "forgot" is shown when the user chose 'Forgot recovery key?' during `SetupEncryptionToast`.
+ *
+ * "confirm" is shown when the user chose 'Reset all' during `SetupEncryptionBody`.
+ */
+export type ResetIdentityBodyVariant = "compromised" | "forgot" | "sync_failed" | "confirm";
+
+/**
+ * User interface component allowing the user to reset their cryptographic identity.
+ *
+ * Used by {@link ResetIdentityPanel}.
+ */
+export function ResetIdentityBody({ onCancelClick, onReset, variant }: ResetIdentityBodyProps): JSX.Element {
+    const matrixClient = useMatrixClientContext();
+
+    // After the user clicks "Continue", we disable the button so it can't be
+    // clicked again, and warn the user not to close the window.
+    const [inProgress, setInProgress] = useState(false);
+
+    return (
+        <EncryptionCard Icon={ErrorIcon} destructive={true} title={titleForVariant(variant)}>
+            <EncryptionCardEmphasisedContent>
+                <VisualList>
+                    <VisualListItem Icon={CheckIcon} success={true}>
+                        {_t("settings|encryption|advanced|breadcrumb_first_description")}
+                    </VisualListItem>
+                    <VisualListItem Icon={InfoIcon}>
+                        {_t("settings|encryption|advanced|breadcrumb_second_description")}
+                    </VisualListItem>
+                    <VisualListItem Icon={InfoIcon}>
+                        {_t("settings|encryption|advanced|breadcrumb_third_description")}
+                    </VisualListItem>
+                </VisualList>
+                {variant === "compromised" && <span>{_t("settings|encryption|advanced|breadcrumb_warning")}</span>}
+            </EncryptionCardEmphasisedContent>
+            <EncryptionCardButtons>
+                <Button
+                    destructive={true}
+                    disabled={inProgress}
+                    onClick={async () => {
+                        setInProgress(true);
+                        await matrixClient
+                            .getCrypto()
+                            ?.resetEncryption((makeRequest) => uiAuthCallback(matrixClient, makeRequest));
+                        onReset();
+                    }}
+                >
+                    {inProgress ? (
+                        <>
+                            <InlineSpinner /> {_t("settings|encryption|advanced|reset_in_progress")}
+                        </>
+                    ) : (
+                        _t("action|continue")
+                    )}
+                </Button>
+                {inProgress ? (
+                    <EncryptionCardEmphasisedContent>
+                        <span className="mx_ResetIdentityPanel_warning">
+                            {_t("settings|encryption|advanced|do_not_close_warning")}
+                        </span>
+                    </EncryptionCardEmphasisedContent>
+                ) : (
+                    <Button kind="tertiary" onClick={onCancelClick}>
+                        {_t("action|cancel")}
+                    </Button>
+                )}
+            </EncryptionCardButtons>
+        </EncryptionCard>
+    );
+}
+
+function titleForVariant(variant: ResetIdentityBodyVariant): string {
+    switch (variant) {
+        case "compromised":
+        case "confirm":
+            return _t("settings|encryption|advanced|breadcrumb_title");
+        case "sync_failed":
+            return _t("settings|encryption|advanced|breadcrumb_title_sync_failed");
+        case "forgot":
+            return _t("settings|encryption|advanced|breadcrumb_title_forgot");
+    }
+}
diff --git a/src/components/views/settings/encryption/ResetIdentityPanel.tsx b/src/components/views/settings/encryption/ResetIdentityPanel.tsx
index f7962b8aaa..45e34fbbac 100644
--- a/src/components/views/settings/encryption/ResetIdentityPanel.tsx
+++ b/src/components/views/settings/encryption/ResetIdentityPanel.tsx
@@ -5,51 +5,35 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { Breadcrumb, Button, InlineSpinner, VisualList, VisualListItem } from "@vector-im/compound-web";
-import CheckIcon from "@vector-im/compound-design-tokens/assets/web/icons/check";
-import InfoIcon from "@vector-im/compound-design-tokens/assets/web/icons/info";
-import ErrorIcon from "@vector-im/compound-design-tokens/assets/web/icons/error-solid";
-import React, { type JSX, useState, type MouseEventHandler } from "react";
+import { Breadcrumb } from "@vector-im/compound-web";
+import React, { type JSX } from "react";
 
 import { _t } from "../../../../languageHandler";
-import { EncryptionCard } from "./EncryptionCard";
-import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
-import { uiAuthCallback } from "../../../../CreateCrossSigning";
-import { EncryptionCardButtons } from "./EncryptionCardButtons";
-import { EncryptionCardEmphasisedContent } from "./EncryptionCardEmphasisedContent";
+import { ResetIdentityBody, type ResetIdentityBodyVariant } from "./ResetIdentityBody";
 
 interface ResetIdentityPanelProps {
     /**
      * Called when the identity is reset.
      */
-    onFinish: MouseEventHandler<HTMLButtonElement>;
+    onReset: () => void;
+
     /**
      * Called when the cancel button is clicked or when we go back in the breadcrumbs.
      */
     onCancelClick: () => void;
 
     /**
-     * The variant of the panel to show. We show more warnings in the 'compromised' variant (no use in showing a user this
-     * warning if they have to reset because they no longer have their key)
-     *
-     * "compromised" is shown when the user chooses 'reset' explicitly in settings, usually because they believe their
-     * identity has been compromised.
-     *
-     * "forgot" is shown when the user has just forgotten their passphrase.
+     * Which variant of this panel to show.
      */
-    variant: "compromised" | "forgot";
+    variant: ResetIdentityBodyVariant;
 }
 
 /**
- * The panel for resetting the identity of the current user.
+ * The Encryption Settings panel for resetting the identity of the current user.
+ *
+ * A thin wrapper around {@link ResetIdentityBody}, just adding breadcrumbs.
  */
-export function ResetIdentityPanel({ onCancelClick, onFinish, variant }: ResetIdentityPanelProps): JSX.Element {
-    const matrixClient = useMatrixClientContext();
-
-    // After the user clicks "Continue", we disable the button so it can't be
-    // clicked again, and warn the user not to close the window.
-    const [inProgress, setInProgress] = useState(false);
-
+export function ResetIdentityPanel({ onCancelClick, onReset, variant }: ResetIdentityPanelProps): JSX.Element {
     return (
         <>
             <Breadcrumb
@@ -58,62 +42,7 @@ export function ResetIdentityPanel({ onCancelClick, onFinish, variant }: ResetId
                 pages={[_t("settings|encryption|title"), _t("settings|encryption|advanced|breadcrumb_page")]}
                 onPageClick={onCancelClick}
             />
-            <EncryptionCard
-                Icon={ErrorIcon}
-                destructive={true}
-                title={
-                    variant === "forgot"
-                        ? _t("settings|encryption|advanced|breadcrumb_title_forgot")
-                        : _t("settings|encryption|advanced|breadcrumb_title")
-                }
-            >
-                <EncryptionCardEmphasisedContent>
-                    <VisualList>
-                        <VisualListItem Icon={CheckIcon} success={true}>
-                            {_t("settings|encryption|advanced|breadcrumb_first_description")}
-                        </VisualListItem>
-                        <VisualListItem Icon={InfoIcon}>
-                            {_t("settings|encryption|advanced|breadcrumb_second_description")}
-                        </VisualListItem>
-                        <VisualListItem Icon={InfoIcon}>
-                            {_t("settings|encryption|advanced|breadcrumb_third_description")}
-                        </VisualListItem>
-                    </VisualList>
-                    {variant === "compromised" && <span>{_t("settings|encryption|advanced|breadcrumb_warning")}</span>}
-                </EncryptionCardEmphasisedContent>
-                <EncryptionCardButtons>
-                    <Button
-                        destructive={true}
-                        disabled={inProgress}
-                        onClick={async (evt) => {
-                            setInProgress(true);
-                            await matrixClient
-                                .getCrypto()
-                                ?.resetEncryption((makeRequest) => uiAuthCallback(matrixClient, makeRequest));
-                            onFinish(evt);
-                        }}
-                    >
-                        {inProgress ? (
-                            <>
-                                <InlineSpinner /> {_t("settings|encryption|advanced|reset_in_progress")}
-                            </>
-                        ) : (
-                            _t("action|continue")
-                        )}
-                    </Button>
-                    {inProgress ? (
-                        <EncryptionCardEmphasisedContent>
-                            <span className="mx_ResetIdentityPanel_warning">
-                                {_t("settings|encryption|advanced|do_not_close_warning")}
-                            </span>
-                        </EncryptionCardEmphasisedContent>
-                    ) : (
-                        <Button kind="tertiary" onClick={onCancelClick}>
-                            {_t("action|cancel")}
-                        </Button>
-                    )}
-                </EncryptionCardButtons>
-            </EncryptionCard>
+            <ResetIdentityBody onReset={onReset} onCancelClick={onCancelClick} variant={variant} />
         </>
     );
 }
diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
index 2615c083c9..b50eb22a7c 100644
--- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx
@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2024 New Vector Ltd.
+Copyright 2019-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.
@@ -22,6 +22,7 @@ import { SettingsSubsection } from "../../shared/SettingsSubsection";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
 import { UrlPreviewSettings } from "../../../room_settings/UrlPreviewSettings";
+import { MediaPreviewAccountSettings } from "../user/MediaPreviewAccountSettings";
 
 interface IProps {
     room: Room;
@@ -92,6 +93,9 @@ export default class GeneralRoomSettingsTab extends React.Component<IProps, ISta
 
                 <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>
             </SettingsTab>
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index a4a94e8bab..89ae96f8a4 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -155,7 +155,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
             if (!confirm) return;
         }
 
-        Modal.createDialog(QuestionDialog, {
+        const { finished } = Modal.createDialog(QuestionDialog, {
             title: _t("room_settings|security|enable_encryption_confirm_title"),
             description: _t(
                 "room_settings|security|enable_encryption_confirm_description",
@@ -164,23 +164,23 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                     a: (sub) => <ExternalLink href={SdkConfig.get("help_encryption_url")}>{sub}</ExternalLink>,
                 },
             ),
-            onFinished: (confirm) => {
-                if (!confirm) {
-                    this.setState({ encrypted: false });
-                    return;
-                }
+        });
+        finished.then(([confirm]) => {
+            if (!confirm) {
+                this.setState({ encrypted: false });
+                return;
+            }
 
-                const beforeEncrypted = this.state.encrypted;
-                this.setState({ encrypted: true });
-                this.context
-                    .sendStateEvent(this.props.room.roomId, EventType.RoomEncryption, {
-                        algorithm: MEGOLM_ENCRYPTION_ALGORITHM,
-                    })
-                    .catch((e) => {
-                        logger.error(e);
-                        this.setState({ encrypted: beforeEncrypted });
-                    });
-            },
+            const beforeEncrypted = this.state.encrypted;
+            this.setState({ encrypted: true });
+            this.context
+                .sendStateEvent(this.props.room.roomId, EventType.RoomEncryption, {
+                    algorithm: MEGOLM_ENCRYPTION_ALGORITHM,
+                })
+                .catch((e) => {
+                    logger.error(e);
+                    this.setState({ encrypted: beforeEncrypted });
+                });
         });
     };
 
@@ -213,9 +213,9 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
 
         const [shouldCreate, opts] = await modal.finished;
         if (shouldCreate) {
-            await createRoom(this.context, opts);
+            await createRoom(this.context, opts!);
         }
-        return shouldCreate;
+        return shouldCreate ?? false;
     };
 
     private onHistoryRadioToggle = (history: HistoryVisibility): void => {
diff --git a/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx
index 83c073c3ce..014527f697 100644
--- a/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx
@@ -165,10 +165,9 @@ const AccountUserSettingsTab: React.FC<IProps> = ({ closeSettingsFn }) => {
     }, []);
 
     const onDeactivateClicked = useCallback((): void => {
-        Modal.createDialog(DeactivateAccountDialog, {
-            onFinished: (success) => {
-                if (success) closeSettingsFn();
-            },
+        const { finished } = Modal.createDialog(DeactivateAccountDialog);
+        finished.then(([success]) => {
+            if (success) closeSettingsFn();
         });
     }, [closeSettingsFn]);
 
diff --git a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
index 987b1d95b6..dea28628fb 100644
--- a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
@@ -21,6 +21,7 @@ import { SettingsSection } from "../../shared/SettingsSection";
 import { SettingsSubheader } from "../../SettingsSubheader";
 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 { KeyStoragePanel } from "../../encryption/KeyStoragePanel";
@@ -39,6 +40,7 @@ import { DeleteKeyStoragePanel } from "../../encryption/DeleteKeyStoragePanel";
  *                        This happens when the user doesn't have a key a recovery key and the user clicks on "Set up recovery key" button of the RecoveryPanel.
  *  - "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.
  *  - "key_storage_delete": The confirmation page asking if the user really wants to turn off key storage.
@@ -52,6 +54,7 @@ export type State =
     | "set_recovery_key"
     | "reset_identity_compromised"
     | "reset_identity_forgot"
+    | "reset_identity_sync_failed"
     | "secrets_not_cached"
     | "key_storage_delete";
 
@@ -120,11 +123,12 @@ export function EncryptionUserSettingsTab({ initialState = "loading" }: Props):
             break;
         case "reset_identity_compromised":
         case "reset_identity_forgot":
+        case "reset_identity_sync_failed":
             content = (
                 <ResetIdentityPanel
-                    variant={state === "reset_identity_compromised" ? "compromised" : "forgot"}
+                    variant={findResetVariant(state)}
                     onCancelClick={checkEncryptionState}
-                    onFinish={checkEncryptionState}
+                    onReset={checkEncryptionState}
                 />
             );
             break;
@@ -140,6 +144,23 @@ export function EncryptionUserSettingsTab({ initialState = "loading" }: Props):
     );
 }
 
+/**
+ * Given what state we want the tab to be in, what variant of the
+ * ResetIdentityPanel do we need?
+ */
+function findResetVariant(state: State): ResetIdentityBodyVariant {
+    switch (state) {
+        case "reset_identity_compromised":
+            return "compromised";
+        case "reset_identity_sync_failed":
+            return "sync_failed";
+
+        default:
+        case "reset_identity_forgot":
+            return "forgot";
+    }
+}
+
 /**
  * Hook to check if the user needs:
  * - to go through the SetupEncryption flow.
@@ -226,7 +247,10 @@ function SetUpEncryptionPanel({ onFinish }: SetUpEncryptionPanelProps): JSX.Elem
             <Button
                 size="sm"
                 Icon={ComputerIcon}
-                onClick={() => Modal.createDialog(SetupEncryptionDialog, { onFinished: onFinish })}
+                onClick={() => {
+                    const { finished } = Modal.createDialog(SetupEncryptionDialog);
+                    finished.then(onFinish);
+                }}
             >
                 {_t("settings|encryption|device_not_verified_button")}
             </Button>
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..5ceeffa4ef
--- /dev/null
+++ b/src/components/views/settings/tabs/user/InviteRulesAccountSettings.tsx
@@ -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.
+*/
+
+import React, { type FC, useCallback, useState } from "react";
+import { Root } 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";
+import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
+
+export const InviteRulesAccountSetting: FC = () => {
+    const rules = useSettingValue("inviteRules");
+    const settingsDisabled = SettingsStore.disabledMessage("inviteRules");
+    const [busy, setBusy] = useState(false);
+
+    const onChange = useCallback(async (checked: boolean) => {
+        try {
+            setBusy(true);
+            await SettingsStore.setValue("inviteRules", null, SettingLevel.ACCOUNT, {
+                allBlocked: !checked,
+            });
+        } catch (ex) {
+            logger.error(`Unable to set invite rules`, ex);
+        } finally {
+            setBusy(false);
+        }
+    }, []);
+    return (
+        <Root className="mx_MediaPreviewAccountSetting_Form">
+            <LabelledToggleSwitch
+                className="mx_MediaPreviewAccountSetting_ToggleSwitch"
+                label={_t("settings|invite_controls|default_label")}
+                value={!rules.allBlocked}
+                onChange={onChange}
+                tooltip={settingsDisabled}
+                disabled={!!settingsDisabled || busy}
+            />
+        </Root>
+    );
+};
diff --git a/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx b/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx
new file mode 100644
index 0000000000..f6a2b7cf38
--- /dev/null
+++ b/src/components/views/settings/tabs/user/MediaPreviewAccountSettings.tsx
@@ -0,0 +1,150 @@
+/*
+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, useCallback } from "react";
+import { Field, HelpMessage, InlineField, Label, RadioInput, Root } 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";
+import SettingsStore from "../../../../../settings/SettingsStore";
+import { SettingLevel } from "../../../../../settings/SettingLevel";
+
+export const MediaPreviewAccountSettings: React.FC<{ roomId?: string }> = ({ roomId }) => {
+    const currentMediaPreview = useSettingValue("mediaPreviewConfig", roomId);
+
+    const changeSetting = useCallback(
+        (newValue: MediaPreviewConfig) => {
+            SettingsStore.setValue(
+                "mediaPreviewConfig",
+                roomId ?? null,
+                roomId ? SettingLevel.ROOM_ACCOUNT : SettingLevel.ACCOUNT,
+                newValue,
+            );
+        },
+        [roomId],
+    );
+
+    const avatarOnChange = useCallback(
+        (c: boolean) => {
+            changeSetting({
+                ...currentMediaPreview,
+                // Switch is inverted. "Hide avatars..."
+                invite_avatars: c ? MediaPreviewValue.Off : MediaPreviewValue.On,
+            });
+        },
+        [changeSetting, currentMediaPreview],
+    );
+
+    const mediaPreviewOnChangeOff = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (event) => {
+            if (!event.target.checked) {
+                return;
+            }
+            changeSetting({
+                ...currentMediaPreview,
+                media_previews: MediaPreviewValue.Off,
+            });
+        },
+        [changeSetting, currentMediaPreview],
+    );
+
+    const mediaPreviewOnChangePrivate = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (event) => {
+            if (!event.target.checked) {
+                return;
+            }
+            changeSetting({
+                ...currentMediaPreview,
+                media_previews: MediaPreviewValue.Private,
+            });
+        },
+        [changeSetting, currentMediaPreview],
+    );
+
+    const mediaPreviewOnChangeOn = useCallback<ChangeEventHandler<HTMLInputElement>>(
+        (event) => {
+            if (!event.target.checked) {
+                return;
+            }
+            changeSetting({
+                ...currentMediaPreview,
+                media_previews: MediaPreviewValue.On,
+            });
+        },
+        [changeSetting, currentMediaPreview],
+    );
+
+    return (
+        <Root className="mx_MediaPreviewAccountSetting_Form">
+            {!roomId && (
+                <LabelledToggleSwitch
+                    className="mx_MediaPreviewAccountSetting_ToggleSwitch"
+                    label={_t("settings|media_preview|hide_avatars")}
+                    value={currentMediaPreview.invite_avatars === MediaPreviewValue.Off}
+                    onChange={avatarOnChange}
+                />
+            )}
+            {/* Explict label here because htmlFor is not supported for linking to radiogroups */}
+            <Field
+                id="mx_media_previews"
+                role="radiogroup"
+                name="media_previews"
+                aria-label={_t("settings|media_preview|media_preview_label")}
+            >
+                <Label>{_t("settings|media_preview|media_preview_label")}</Label>
+                <HelpMessage className="mx_MediaPreviewAccountSetting_RadioHelp">
+                    {_t("settings|media_preview|media_preview_description")}
+                </HelpMessage>
+                <InlineField
+                    name="media_preview_off"
+                    className="mx_MediaPreviewAccountSetting_Radio"
+                    control={
+                        <RadioInput
+                            id="mx_media_previews_off"
+                            checked={currentMediaPreview.media_previews === MediaPreviewValue.Off}
+                            onChange={mediaPreviewOnChangeOff}
+                        />
+                    }
+                >
+                    <Label htmlFor="mx_media_previews_off">{_t("settings|media_preview|hide_media")}</Label>
+                </InlineField>
+                {!roomId && (
+                    <InlineField
+                        name="mx_media_previews_private"
+                        className="mx_MediaPreviewAccountSetting_Radio"
+                        control={
+                            <RadioInput
+                                id="mx_media_previews_private"
+                                checked={currentMediaPreview.media_previews === MediaPreviewValue.Private}
+                                onChange={mediaPreviewOnChangePrivate}
+                            />
+                        }
+                    >
+                        <Label htmlFor="mx_media_previews_private">
+                            {_t("settings|media_preview|show_in_private")}
+                        </Label>
+                    </InlineField>
+                )}
+                <InlineField
+                    name="media_preview_on"
+                    className="mx_MediaPreviewAccountSetting_Radio"
+                    control={
+                        <RadioInput
+                            id="mx_media_previews_on"
+                            checked={currentMediaPreview.media_previews === MediaPreviewValue.On}
+                            onChange={mediaPreviewOnChangeOn}
+                        />
+                    }
+                >
+                    <Label htmlFor="mx_media_previews_on">{_t("settings|media_preview|show_media")}</Label>
+                </InlineField>
+            </Field>
+        </Root>
+    );
+};
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 11b889304a..ecf2766b20 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.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 ReactElement, useCallback, useEffect, useState } from "react";
+import React, { type JSX, type ReactElement, useCallback, useEffect, useState } from "react";
 
 import { type NonEmptyArray } from "../../../../../@types/common";
 import { _t, getCurrentLanguage } from "../../../../../languageHandler";
@@ -32,6 +32,8 @@ 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";
 
 interface IProps {
     closeSettingsFn(success: boolean): void;
@@ -116,7 +118,7 @@ const SpellCheckSection: React.FC = () => {
 };
 
 export default class PreferencesUserSettingsTab extends React.Component<IProps, IState> {
-    private static ROOM_LIST_SETTINGS: BooleanSettingKey[] = ["breadcrumbs", "showAvatarsOnInvites"];
+    private static ROOM_LIST_SETTINGS: BooleanSettingKey[] = ["breadcrumbs"];
 
     private static SPACES_SETTINGS: BooleanSettingKey[] = ["Spaces.allRoomsInHome"];
 
@@ -146,7 +148,6 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         "urlPreviewsEnabled",
         "autoplayGifs",
         "autoplayVideo",
-        "showImages",
     ];
 
     private static TIMELINE_SETTINGS: BooleanSettingKey[] = [
@@ -242,12 +243,12 @@ 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(),
         });
 
+        const newRoomListEnabled = SettingsStore.getValue("feature_new_room_list");
+
         // Always Preprend the default option
         const timezones = this.state.timezones.map((tz) => {
             return <div key={tz}>{tz}</div>;
@@ -263,11 +264,13 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                         <SpellCheckSection />
                     </SettingsSubsection>
 
-                    {roomListSettings.length > 0 && (
-                        <SettingsSubsection heading={_t("settings|preferences|room_list_heading")}>
-                            {this.renderGroup(roomListSettings)}
-                        </SettingsSubsection>
-                    )}
+                    <SettingsSubsection heading={_t("settings|preferences|room_list_heading")}>
+                        {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")}>
                         {this.renderGroup(PreferencesUserSettingsTab.SPACES_SETTINGS, SettingLevel.ACCOUNT)}
@@ -335,6 +338,11 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                         {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")}>
                         {this.renderGroup(PreferencesUserSettingsTab.ROOM_DIRECTORY_SETTINGS)}
                     </SettingsSubsection>
@@ -351,6 +359,12 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                                 appName: SdkConfig.get().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 />
diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
index 813576c757..1c85aada34 100644
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
@@ -17,13 +17,10 @@ import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher/dispatcher";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
-import SecureBackupPanel from "../../SecureBackupPanel";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import { type ActionPayload } from "../../../../../dispatcher/payloads";
-import CryptographyPanel from "../../CryptographyPanel";
 import SettingsFlag from "../../../elements/SettingsFlag";
-import CrossSigningPanel from "../../CrossSigningPanel";
 import EventIndexPanel from "../../EventIndexPanel";
 import InlineSpinner from "../../../elements/InlineSpinner";
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
@@ -42,21 +39,20 @@ interface IIgnoredUserProps {
     inProgress: boolean;
 }
 
-const DehydratedDeviceStatus: React.FC = () => {
+const SecureBackup: React.FC = () => {
     const { dehydratedDeviceId } = useOwnDevices();
+    if (!dehydratedDeviceId) return null;
 
-    if (dehydratedDeviceId) {
-        return (
+    return (
+        <SettingsSubsection heading={_t("common|secure_backup")}>
             <div className="mx_SettingsSubsection_content">
                 <div className="mx_SettingsFlag_label">{_t("settings|security|dehydrated_device_enabled")}</div>
                 <div className="mx_SettingsSubsection_text">
                     {_t("settings|security|dehydrated_device_description")}
                 </div>
             </div>
-        );
-    } else {
-        return null;
-    }
+        </SettingsSubsection>
+    );
 };
 
 export class IgnoredUser extends React.Component<IIgnoredUserProps> {
@@ -67,7 +63,7 @@ export class IgnoredUser extends React.Component<IIgnoredUserProps> {
     public render(): React.ReactNode {
         const id = `mx_SecurityUserSettingsTab_ignoredUser_${this.props.userId}`;
         return (
-            <div className="mx_SecurityUserSettingsTab_ignoredUser">
+            <li className="mx_SecurityUserSettingsTab_ignoredUser" aria-label={this.props.userId}>
                 <AccessibleButton
                     onClick={this.onUnignoreClicked}
                     kind="primary_sm"
@@ -77,7 +73,7 @@ export class IgnoredUser extends React.Component<IIgnoredUserProps> {
                     {_t("action|unignore")}
                 </AccessibleButton>
                 <span id={id}>{this.props.userId}</span>
-            </div>
+            </li>
         );
     }
 }
@@ -234,23 +230,34 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
 
     private renderIgnoredUsers(): JSX.Element {
         const { waitingUnignored, ignoredUserIds } = this.state;
-
-        const userIds = !ignoredUserIds?.length
-            ? _t("settings|security|ignore_users_empty")
-            : ignoredUserIds.map((u) => {
-                  return (
-                      <IgnoredUser
-                          userId={u}
-                          onUnignored={this.onUserUnignored}
-                          key={u}
-                          inProgress={waitingUnignored.includes(u)}
-                      />
-                  );
-              });
+        if (!ignoredUserIds?.length) {
+            return (
+                <SettingsSubsection heading={_t("settings|security|ignore_users_section")}>
+                    <SettingsSubsectionText>{_t("settings|security|ignore_users_empty")}</SettingsSubsectionText>
+                </SettingsSubsection>
+            );
+        }
 
         return (
-            <SettingsSubsection heading={_t("settings|security|ignore_users_section")}>
-                <SettingsSubsectionText>{userIds}</SettingsSubsectionText>
+            <SettingsSubsection
+                id="mx_SecurityUserSettingsTab_ignoredUsersHeading"
+                heading={_t("settings|security|ignore_users_section")}
+            >
+                <SettingsSubsectionText>
+                    <ul
+                        aria-label={_t("settings|security|ignore_users_section")}
+                        className="mx_SecurityUserSettingsTab_ignoredUsers"
+                    >
+                        {ignoredUserIds.map((u) => (
+                            <IgnoredUser
+                                userId={u}
+                                onUnignored={this.onUserUnignored}
+                                key={u}
+                                inProgress={waitingUnignored.includes(u)}
+                            />
+                        ))}
+                    </ul>
+                </SettingsSubsectionText>
             </SettingsSubsection>
         );
     }
@@ -286,12 +293,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
     }
 
     public render(): React.ReactNode {
-        const secureBackup = (
-            <SettingsSubsection heading={_t("common|secure_backup")}>
-                <SecureBackupPanel />
-                <DehydratedDeviceStatus />
-            </SettingsSubsection>
-        );
+        const secureBackup = <SecureBackup />;
 
         const eventIndex = (
             <SettingsSubsection heading={_t("settings|security|message_search_section")}>
@@ -299,16 +301,6 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
             </SettingsSubsection>
         );
 
-        // XXX: There's no such panel in the current cross-signing designs, but
-        // it's useful to have for testing the feature. If there's no interest
-        // in having advanced details here once all flows are implemented, we
-        // can remove this.
-        const crossSigning = (
-            <SettingsSubsection heading={_t("common|cross_signing")}>
-                <CrossSigningPanel />
-            </SettingsSubsection>
-        );
-
         let warning;
         if (!privateShouldBeEncrypted(MatrixClientPeg.safeGet())) {
             warning = (
@@ -368,8 +360,6 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
                 <SettingsSection heading={_t("settings|security|encryption_section")}>
                     {secureBackup}
                     {eventIndex}
-                    {crossSigning}
-                    <CryptographyPanel />
                 </SettingsSection>
                 <SettingsSection heading={_t("common|privacy")}>
                     <DiscoverySettings />
diff --git a/src/components/views/settings/tabs/user/SessionManagerTab.tsx b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
index c5d9385d7b..ab5b941cde 100644
--- a/src/components/views/settings/tabs/user/SessionManagerTab.tsx
+++ b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
@@ -9,7 +9,6 @@ Please see LICENSE files in the repository root for full details.
 import React, { lazy, Suspense, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import { _t } from "../../../../../languageHandler";
 import Modal from "../../../../../Modal";
@@ -98,9 +97,9 @@ const useSignOut = (
                 const url = getManageDeviceUrl(delegatedAuthAccountUrl, deviceId);
                 window.open(url, "_blank");
             } else {
-                const deferredSuccess = defer<boolean>();
+                const deferredSuccess = Promise.withResolvers<boolean>();
                 await deleteDevicesWithInteractiveAuth(matrixClient, deviceIds, async (success) => {
-                    deferredSuccess.resolve(success);
+                    deferredSuccess.resolve(!!success);
                 });
                 success = await deferredSuccess.promise;
             }
@@ -203,7 +202,8 @@ const SessionManagerTab: React.FC<{
     const shouldShowOtherSessions = otherSessionsCount > 0;
 
     const onVerifyCurrentDevice = (): void => {
-        Modal.createDialog(SetupEncryptionDialog, { onFinished: refreshDevices });
+        const { finished } = Modal.createDialog(SetupEncryptionDialog);
+        finished.then(refreshDevices);
     };
 
     const onTriggerDeviceVerification = useCallback(
@@ -212,14 +212,14 @@ const SessionManagerTab: React.FC<{
                 return;
             }
             const verificationRequestPromise = requestDeviceVerification(deviceId);
-            Modal.createDialog(VerificationRequestDialog, {
+            const { finished } = Modal.createDialog(VerificationRequestDialog, {
                 verificationRequestPromise,
                 member: currentUserMember,
-                onFinished: async (): Promise<void> => {
-                    const request = await verificationRequestPromise;
-                    request.cancel();
-                    await refreshDevices();
-                },
+            });
+            finished.then(async () => {
+                const request = await verificationRequestPromise;
+                request.cancel();
+                await refreshDevices();
             });
         },
         [requestDeviceVerification, refreshDevices, currentUserMember],
diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
index 321f6c9e36..9f0d534767 100644
--- a/src/components/views/spaces/SpacePanel.tsx
+++ b/src/components/views/spaces/SpacePanel.tsx
@@ -363,6 +363,8 @@ const SpacePanel: React.FC = () => {
         }
     });
 
+    const newRoomListEnabled = useSettingValue("feature_new_room_list");
+
     return (
         <RovingTabIndexProvider handleHomeEnd handleUpDown={!dragging}>
             {({ onKeyDownHandler, onDragEndHandler }) => (
@@ -378,7 +380,10 @@ const SpacePanel: React.FC = () => {
                     }}
                 >
                     <nav
-                        className={classNames("mx_SpacePanel", { collapsed: isPanelCollapsed })}
+                        className={classNames("mx_SpacePanel", {
+                            collapsed: isPanelCollapsed,
+                            newUi: newRoomListEnabled,
+                        })}
                         onKeyDown={(ev) => {
                             const navAction = getKeyBindingsManager().getNavigationAction(ev);
                             if (
diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index 28f56a072c..d03ac8a1e2 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -45,7 +45,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 
 type ButtonProps<T extends keyof HTMLElementTagNameMap> = Omit<
     AccessibleButtonProps<T>,
-    "title" | "onClick" | "size" | "element"
+    "title" | "onClick" | "size" | "element" | "ref"
 > & {
     space?: Room;
     spaceKey?: SpaceKey;
diff --git a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
index 75f4553116..be7fa2bd0e 100644
--- a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
+++ b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentre.tsx
@@ -24,10 +24,7 @@ import { type NotificationLevel } from "../../../../stores/notifications/Notific
 import PosthogTrackers from "../../../../PosthogTrackers";
 import { getKeyBindingsManager } from "../../../../KeyBindingsManager";
 import { KeyBindingAction } from "../../../../accessibility/KeyboardShortcuts";
-import { ReleaseAnnouncement } from "../../../structures/ReleaseAnnouncement";
-import { useIsReleaseAnnouncementOpen } from "../../../../hooks/useIsReleaseAnnouncementOpen";
 import { useSettingValue } from "../../../../hooks/useSettings";
-import { ReleaseAnnouncementStore } from "../../../../stores/ReleaseAnnouncementStore";
 
 interface ThreadsActivityCentreProps {
     /**
@@ -43,7 +40,6 @@ interface ThreadsActivityCentreProps {
 export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCentreProps): JSX.Element {
     const [open, setOpen] = useState(false);
     const roomsAndNotifications = useUnreadThreadRooms(open);
-    const isReleaseAnnouncementOpen = useIsReleaseAnnouncementOpen("threadsActivityCentre");
     const settingTACOnlyNotifs = useSettingValue("Notifications.tac_only_notifications");
 
     const emptyCaption = settingTACOnlyNotifs
@@ -65,59 +61,39 @@ export function ThreadsActivityCentre({ displayButtonLabel }: ThreadsActivityCen
                 }
             }}
         >
-            {isReleaseAnnouncementOpen ? (
-                <ReleaseAnnouncement
-                    feature="threadsActivityCentre"
-                    header={_t("threads_activity_centre|release_announcement_header")}
-                    description={_t("threads_activity_centre|release_announcement_description")}
-                    closeLabel={_t("action|ok")}
-                >
+            <Menu
+                align="start"
+                side="top"
+                open={open}
+                onOpenChange={(newOpen) => {
+                    // Track only when the Threads Activity Centre is opened
+                    if (newOpen) PosthogTrackers.trackInteraction("WebThreadsActivityCentreButton");
+
+                    setOpen(newOpen);
+                }}
+                title={_t("threads_activity_centre|header")}
+                trigger={
                     <ThreadsActivityCentreButton
-                        disableTooltip={true}
                         displayLabel={displayButtonLabel}
                         notificationLevel={roomsAndNotifications.greatestNotificationLevel}
-                        onClick={async () => {
-                            // Open the TAC after the release announcement closing
-                            setOpen(true);
-                            await ReleaseAnnouncementStore.instance.nextReleaseAnnouncement();
-                        }}
                     />
-                </ReleaseAnnouncement>
-            ) : (
-                <Menu
-                    align="start"
-                    side="top"
-                    open={open}
-                    onOpenChange={(newOpen) => {
-                        // Track only when the Threads Activity Centre is opened
-                        if (newOpen) PosthogTrackers.trackInteraction("WebThreadsActivityCentreButton");
-
-                        setOpen(newOpen);
-                    }}
-                    title={_t("threads_activity_centre|header")}
-                    trigger={
-                        <ThreadsActivityCentreButton
-                            displayLabel={displayButtonLabel}
-                            notificationLevel={roomsAndNotifications.greatestNotificationLevel}
+                }
+            >
+                {/* Make the content of the pop-up scrollable */}
+                <div className="mx_ThreadsActivityCentre_rows">
+                    {roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
+                        <ThreadsActivityCentreRow
+                            key={room.roomId}
+                            room={room}
+                            notificationLevel={notificationLevel}
+                            onClick={() => setOpen(false)}
                         />
-                    }
-                >
-                    {/* Make the content of the pop-up scrollable */}
-                    <div className="mx_ThreadsActivityCentre_rows">
-                        {roomsAndNotifications.rooms.map(({ room, notificationLevel }) => (
-                            <ThreadsActivityCentreRow
-                                key={room.roomId}
-                                room={room}
-                                notificationLevel={notificationLevel}
-                                onClick={() => setOpen(false)}
-                            />
-                        ))}
-                        {roomsAndNotifications.rooms.length === 0 && (
-                            <div className="mx_ThreadsActivityCentre_emptyCaption">{emptyCaption}</div>
-                        )}
-                    </div>
-                </Menu>
-            )}
+                    ))}
+                    {roomsAndNotifications.rooms.length === 0 && (
+                        <div className="mx_ThreadsActivityCentre_emptyCaption">{emptyCaption}</div>
+                    )}
+                </div>
+            </Menu>
         </div>
     );
 }
diff --git a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
index bb04df275b..9d43655c60 100644
--- a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
+++ b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
@@ -6,7 +6,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import React, { type ComponentProps, forwardRef } from "react";
+import React, { type ComponentProps, type Ref, type JSX } from "react";
 import ThreadsSolidIcon from "@vector-im/compound-design-tokens/assets/web/icons/threads-solid";
 import classNames from "classnames";
 import { IconButton, Text, Tooltip } from "@vector-im/compound-web";
@@ -28,44 +28,46 @@ interface ThreadsActivityCentreButtonProps extends ComponentProps<typeof IconBut
      * The notification level of the threads.
      */
     notificationLevel: NotificationLevel;
+    ref?: Ref<HTMLButtonElement>;
 }
 
 /**
  * A button to open the thread activity centre.
  */
-export const ThreadsActivityCentreButton = forwardRef<HTMLButtonElement, ThreadsActivityCentreButtonProps>(
-    function ThreadsActivityCentreButton(
-        { displayLabel, notificationLevel, disableTooltip, ...props },
-        ref,
-    ): React.JSX.Element {
-        // Disable tooltip when the label is displayed
-        const openTooltip = disableTooltip || displayLabel ? false : undefined;
+export const ThreadsActivityCentreButton = function ThreadsActivityCentreButton({
+    displayLabel,
+    notificationLevel,
+    disableTooltip,
+    ref,
+    ...props
+}: ThreadsActivityCentreButtonProps): JSX.Element {
+    // Disable tooltip when the label is displayed
+    const openTooltip = disableTooltip || displayLabel ? false : undefined;
 
-        return (
-            <Tooltip label={_t("common|threads")} placement="right" open={openTooltip}>
-                <IconButton
-                    aria-label={_t("common|threads")}
-                    className={classNames("mx_ThreadsActivityCentreButton", { expanded: displayLabel })}
-                    indicator={notificationLevelToIndicator(notificationLevel)}
-                    {...props}
-                    ref={ref}
-                >
-                    <>
-                        <ThreadsSolidIcon className="mx_ThreadsActivityCentreButton_Icon" />
-                        {/* This is dirty, but we need to add the label to the indicator icon */}
-                        {displayLabel && (
-                            <Text
-                                className="mx_ThreadsActivityCentreButton_Text"
-                                as="span"
-                                size="md"
-                                title={_t("common|threads")}
-                            >
-                                {_t("common|threads")}
-                            </Text>
-                        )}
-                    </>
-                </IconButton>
-            </Tooltip>
-        );
-    },
-);
+    return (
+        <Tooltip label={_t("common|threads")} placement="right" open={openTooltip}>
+            <IconButton
+                aria-label={_t("common|threads")}
+                className={classNames("mx_ThreadsActivityCentreButton", { expanded: displayLabel })}
+                indicator={notificationLevelToIndicator(notificationLevel)}
+                {...props}
+                ref={ref}
+            >
+                <>
+                    <ThreadsSolidIcon className="mx_ThreadsActivityCentreButton_Icon" />
+                    {/* This is dirty, but we need to add the label to the indicator icon */}
+                    {displayLabel && (
+                        <Text
+                            className="mx_ThreadsActivityCentreButton_Text"
+                            as="span"
+                            size="md"
+                            title={_t("common|threads")}
+                        >
+                            {_t("common|threads")}
+                        </Text>
+                    )}
+                </>
+            </IconButton>
+        </Tooltip>
+    );
+};
diff --git a/src/components/views/toasts/VerificationRequestToast.tsx b/src/components/views/toasts/VerificationRequestToast.tsx
index e3975c148b..12843c0b87 100644
--- a/src/components/views/toasts/VerificationRequestToast.tsx
+++ b/src/components/views/toasts/VerificationRequestToast.tsx
@@ -124,18 +124,16 @@ export default class VerificationRequestToast extends React.PureComponent<IProps
                     request.roomId,
                 );
             } else {
-                Modal.createDialog(
+                const { finished } = Modal.createDialog(
                     VerificationRequestDialog,
                     {
                         verificationRequest: request,
-                        onFinished: () => {
-                            request.cancel();
-                        },
                     },
                     undefined,
                     /* priority = */ false,
                     /* static = */ true,
                 );
+                finished.then(() => request.cancel());
             }
             await request.accept();
         } catch (err) {
diff --git a/src/components/views/voip/LegacyCallView.tsx b/src/components/views/voip/LegacyCallView.tsx
index c972cb21d4..255b1ab0f4 100644
--- a/src/components/views/voip/LegacyCallView.tsx
+++ b/src/components/views/voip/LegacyCallView.tsx
@@ -66,26 +66,15 @@ interface IState {
 }
 
 function getFullScreenElement(): Element | null {
-    return (
-        document.fullscreenElement ||
-        // moz omitted because firefox supports this unprefixed now (webkit here for safari)
-        document.webkitFullscreenElement ||
-        document.msFullscreenElement
-    );
+    return document.fullscreenElement;
 }
 
 function requestFullscreen(element: Element): void {
-    const method =
-        element.requestFullscreen ||
-        // moz omitted since firefox supports unprefixed now
-        element.webkitRequestFullScreen ||
-        element.msRequestFullscreen;
-    if (method) method.call(element);
+    element.requestFullscreen();
 }
 
 function exitFullscreen(): void {
-    const exitMethod = document.exitFullscreen || document.webkitExitFullscreen || document.msExitFullscreen;
-    if (exitMethod) exitMethod.call(document);
+    document.exitFullscreen();
 }
 
 export default class LegacyCallView extends React.Component<IProps, IState> {
diff --git a/src/components/views/voip/LegacyCallView/LegacyCallViewButtons.tsx b/src/components/views/voip/LegacyCallView/LegacyCallViewButtons.tsx
index d9fc85c943..0e81b5278e 100644
--- a/src/components/views/voip/LegacyCallView/LegacyCallViewButtons.tsx
+++ b/src/components/views/voip/LegacyCallView/LegacyCallViewButtons.tsx
@@ -8,7 +8,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, { createRef, useState, forwardRef } from "react";
+import React, { createRef, useState, type Ref, type FC } from "react";
 import classNames from "classnames";
 import { type MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 
@@ -41,31 +41,40 @@ type ButtonProps = Omit<AccessibleButtonProps<"div">, "title" | "element"> & {
     offLabel?: string;
     forceHide?: boolean;
     onHover?: (hovering: boolean) => void;
+    ref?: Ref<HTMLElement>;
 };
 
-const LegacyCallViewToggleButton = forwardRef<HTMLElement, ButtonProps>(
-    ({ children, state: isOn, className, onLabel, offLabel, forceHide, onHover, ...props }, ref) => {
-        const classes = classNames("mx_LegacyCallViewButtons_button", className, {
-            mx_LegacyCallViewButtons_button_on: isOn,
-            mx_LegacyCallViewButtons_button_off: !isOn,
-        });
+const LegacyCallViewToggleButton: FC<ButtonProps> = ({
+    children,
+    state: isOn,
+    className,
+    onLabel,
+    offLabel,
+    forceHide,
+    onHover,
+    ref,
+    ...props
+}) => {
+    const classes = classNames("mx_LegacyCallViewButtons_button", className, {
+        mx_LegacyCallViewButtons_button_on: isOn,
+        mx_LegacyCallViewButtons_button_off: !isOn,
+    });
 
-        const title = forceHide ? undefined : isOn ? onLabel : offLabel;
+    const title = forceHide ? undefined : isOn ? onLabel : offLabel;
 
-        return (
-            <AccessibleButton
-                ref={ref}
-                className={classes}
-                title={title}
-                placement="top"
-                onTooltipOpenChange={onHover}
-                {...props}
-            >
-                {children}
-            </AccessibleButton>
-        );
-    },
-);
+    return (
+        <AccessibleButton
+            ref={ref}
+            className={classes}
+            title={title}
+            placement="top"
+            onTooltipOpenChange={onHover}
+            {...props}
+        >
+            {children}
+        </AccessibleButton>
+    );
+};
 
 interface IDropdownButtonProps extends ButtonProps {
     deviceKinds: MediaDeviceKindEnum[];
diff --git a/src/contexts/MatrixClientContext.tsx b/src/contexts/MatrixClientContext.tsx
index 0810465789..1783c9a12f 100644
--- a/src/contexts/MatrixClientContext.tsx
+++ b/src/contexts/MatrixClientContext.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 ComponentClass, createContext, forwardRef, useContext } from "react";
+import React, { type ComponentClass, createContext, useContext } from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 // This context is available to components under LoggedInView,
@@ -24,22 +24,16 @@ export function useMatrixClientContext(): MatrixClient {
     return useContext(MatrixClientContext);
 }
 
-const matrixHOC = <ComposedComponentProps extends object>(
-    ComposedComponent: ComponentClass<ComposedComponentProps>,
-): ((
-    props: Omit<ComposedComponentProps, "mxClient"> & React.RefAttributes<InstanceType<typeof ComposedComponent>>,
-) => React.ReactElement | null) => {
-    type ComposedComponentInstance = InstanceType<typeof ComposedComponent>;
-
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-
-    const TypedComponent = ComposedComponent;
-
-    return forwardRef<ComposedComponentInstance, Omit<ComposedComponentProps, "mxClient">>((props, ref) => {
+const matrixHOC =
+    <ComposedComponentProps extends object>(
+        ComposedComponent: ComponentClass<ComposedComponentProps>,
+    ): ((
+        props: Omit<ComposedComponentProps, "mxClient"> & React.RefAttributes<InstanceType<typeof ComposedComponent>>,
+    ) => React.ReactElement | null) =>
+    (props) => {
         const client = useContext(MatrixClientContext);
 
         // @ts-ignore
-        return <TypedComponent ref={ref} {...props} mxClient={client} />;
-    });
-};
+        return <ComposedComponent {...props} mxClient={client} />;
+    };
 export const withMatrixClientHOC = matrixHOC;
diff --git a/src/createRoom.ts b/src/createRoom.ts
index f226f68011..df0f90b91f 100644
--- a/src/createRoom.ts
+++ b/src/createRoom.ts
@@ -28,7 +28,6 @@ import { _t, UserFriendlyError } from "./languageHandler";
 import dis from "./dispatcher/dispatcher";
 import * as Rooms from "./Rooms";
 import { getAddressType } from "./UserAddress";
-import { VIRTUAL_ROOM_EVENT_TYPE } from "./call-types";
 import SpaceStore from "./stores/spaces/SpaceStore";
 import { makeSpaceParentEvent } from "./utils/space";
 import { JitsiCall, ElementCall } from "./models/Call";
@@ -423,36 +422,6 @@ export async function canEncryptToAllUsers(client: MatrixClient, userIds: string
     return true;
 }
 
-// Similar to ensureDMExists but also adds creation content
-// without polluting ensureDMExists with unrelated stuff (also
-// they're never encrypted).
-export async function ensureVirtualRoomExists(
-    client: MatrixClient,
-    userId: string,
-    nativeRoomId: string,
-): Promise<string | null> {
-    const existingDMRoom = findDMForUser(client, userId);
-    let roomId: string | null;
-    if (existingDMRoom) {
-        roomId = existingDMRoom.roomId;
-    } else {
-        roomId = await createRoom(client, {
-            dmUserId: userId,
-            spinner: false,
-            andView: false,
-            createOpts: {
-                creation_content: {
-                    // This allows us to recognise that the room is a virtual room
-                    // when it comes down our sync stream (we also put the ID of the
-                    // respective native room in there because why not?)
-                    [VIRTUAL_ROOM_EVENT_TYPE]: nativeRoomId,
-                },
-            },
-        });
-    }
-    return roomId;
-}
-
 export async function ensureDMExists(client: MatrixClient, userId: string): Promise<string | null> {
     const existingDMRoom = findDMForUser(client, userId);
     let roomId: string | null;
diff --git a/src/dispatcher/actions.ts b/src/dispatcher/actions.ts
index d3a6bc38a1..e6616a7e21 100644
--- a/src/dispatcher/actions.ts
+++ b/src/dispatcher/actions.ts
@@ -26,6 +26,11 @@ export enum Action {
      */
     ViewUser = "view_user",
 
+    /**
+     * Share a text message by forwarding it to a room selected by the user
+     */
+    Share = "share",
+
     /**
      * Open the user settings. No additional payload information required.
      * Optionally can include an OpenToTabPayload.
@@ -235,6 +240,12 @@ export enum Action {
      */
     AfterLeaveRoom = "after_leave_room",
 
+    /**
+     * Dispatched after a room has been successfully forgotten
+     * Should be used with AfterForgetRoomPayload.
+     */
+    AfterForgetRoom = "after_forget_room",
+
     /**
      * Used to defer actions until after sync is complete
      * LifecycleStore will emit deferredAction payload after 'MatrixActions.sync'
@@ -362,7 +373,7 @@ export enum Action {
     View3pidInvite = "view_3pid_invite",
 
     /**
-     * Opens right panel room summary and focuses the search input
+     * Opens right panel room summary and focuses the search input. Use with a FocusMessageSearchPayload.
      */
     FocusMessageSearch = "focus_search",
 
diff --git a/src/dispatcher/payloads/AfterForgetRoomPayload.ts b/src/dispatcher/payloads/AfterForgetRoomPayload.ts
new file mode 100644
index 0000000000..ba480e7ff7
--- /dev/null
+++ b/src/dispatcher/payloads/AfterForgetRoomPayload.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.
+ */
+
+import { type Room } from "matrix-js-sdk/src/matrix";
+
+import { type Action } from "../actions";
+import { type ActionPayload } from "../payloads";
+
+export interface AfterForgetRoomPayload extends ActionPayload {
+    action: Action.AfterForgetRoom;
+    room: Room;
+}
diff --git a/src/dispatcher/payloads/FocusMessageSearchPayload.ts b/src/dispatcher/payloads/FocusMessageSearchPayload.ts
new file mode 100644
index 0000000000..a06f7f5174
--- /dev/null
+++ b/src/dispatcher/payloads/FocusMessageSearchPayload.ts
@@ -0,0 +1,15 @@
+/*
+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 Action } from "../actions";
+import { type ActionPayload } from "../payloads";
+
+export interface FocusMessageSearchPayload extends ActionPayload {
+    action: Action.FocusMessageSearch;
+
+    initialText?: string;
+}
diff --git a/src/dispatcher/payloads/SharePayload.ts b/src/dispatcher/payloads/SharePayload.ts
new file mode 100644
index 0000000000..0aa44fe12f
--- /dev/null
+++ b/src/dispatcher/payloads/SharePayload.ts
@@ -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 { type ActionPayload } from "../payloads";
+import { type Action } from "../actions";
+
+export enum ShareFormat {
+    Text = "text",
+    Html = "html",
+    Markdown = "md",
+}
+
+export interface SharePayload extends ActionPayload {
+    action: Action.Share;
+
+    /**
+     * The format of message to be shared (optional)
+     */
+    format: ShareFormat;
+
+    /**
+     * The message to be shared.
+     */
+    msg: string;
+}
diff --git a/src/events/EventTileFactory.tsx b/src/events/EventTileFactory.tsx
index 12e9f869f3..f1fc224471 100644
--- a/src/events/EventTileFactory.tsx
+++ b/src/events/EventTileFactory.tsx
@@ -69,7 +69,7 @@ export interface EventTileTypeProps
 }
 
 type FactoryProps = Omit<EventTileTypeProps, "ref">;
-type Factory<X = FactoryProps> = (ref: Optional<React.RefObject<any>>, props: X) => JSX.Element;
+type Factory<X = FactoryProps> = (ref: React.RefObject<any> | undefined, props: X) => JSX.Element;
 
 export const MessageEventFactory: Factory = (ref, props) => <MessageEvent ref={ref} {...props} />;
 const LegacyCallEventFactory: Factory<FactoryProps & { callEventGrouper: LegacyCallEventGrouper }> = (ref, props) => (
diff --git a/src/hooks/room/useRoomCall.tsx b/src/hooks/room/useRoomCall.tsx
index e0dfbdcdeb..8d7667aa7d 100644
--- a/src/hooks/room/useRoomCall.tsx
+++ b/src/hooks/room/useRoomCall.tsx
@@ -10,7 +10,7 @@ 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 { useFeatureEnabled } from "../useSettings";
+import { useFeatureEnabled, useSettingValue } from "../useSettings";
 import SdkConfig from "../../SdkConfig";
 import { useEventEmitter, useEventEmitterState } from "../useEventEmitter";
 import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../LegacyCallHandler";
@@ -33,7 +33,6 @@ import { Action } from "../../dispatcher/actions";
 import { CallStore, CallStoreEvent } from "../../stores/CallStore";
 import { isVideoRoom } from "../../utils/video-rooms";
 import { useGuestAccessInformation } from "./useGuestAccessInformation";
-import SettingsStore from "../../settings/SettingsStore";
 import { UIFeature } from "../../settings/UIFeature";
 import { BetaPill } from "../../components/views/beta/BetaCard";
 import { type InteractionName } from "../../PosthogTrackers";
@@ -102,6 +101,8 @@ export const useRoomCall = (
 } => {
     // settings
     const groupCallsEnabled = useFeatureEnabled("feature_group_calls");
+    const widgetsFeatureEnabled = useSettingValue(UIFeature.Widgets);
+    const voipFeatureEnabled = useSettingValue(UIFeature.Voip);
     const useElementCallExclusively = useMemo(() => {
         return SdkConfig.get("element_call").use_exclusively;
     }, []);
@@ -285,8 +286,8 @@ export const useRoomCall = (
     // 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 hideVideoCallButton = false;
-    // We hide both buttons if they require widgets but widgets are disabled.
-    if (memberCount > 2 && !SettingsStore.getValue(UIFeature.Widgets)) {
+    // We hide both buttons if they require widgets but widgets are disabled, or if the Voip feature is disabled.
+    if ((memberCount > 2 && !widgetsFeatureEnabled) || !voipFeatureEnabled) {
         hideVoiceCallButton = true;
         hideVideoCallButton = true;
     }
diff --git a/src/hooks/room/useRoomIdName.ts b/src/hooks/room/useRoomIdName.ts
new file mode 100644
index 0000000000..c7930029e2
--- /dev/null
+++ b/src/hooks/room/useRoomIdName.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 Room } from "matrix-js-sdk/src/matrix";
+
+import { useDmMember } from "../../components/views/avatars/WithPresenceIndicator.tsx";
+import { LocalRoom } from "../../models/LocalRoom.ts";
+
+/**
+ * Determine a stable ID for generating hash colours. If the room
+ * is a DM (or local room), then the other user's ID will be used.
+ * @param oobData - out-of-band information about the room
+ * @returns An ID string, or undefined if the room and oobData are undefined.
+ */
+export function useRoomIdName(room?: Room, oobData?: { roomId?: string }): string | undefined {
+    const dmMember = useDmMember(room);
+    if (dmMember) {
+        // If the room is a DM, we use the other user's ID for the color hash
+        // in order to match the room avatar with their avatar
+        return dmMember.userId;
+    } else if (room instanceof LocalRoom && room.targets.length === 1) {
+        return room.targets[0].userId;
+    } else if (room) {
+        return room.roomId;
+    } else {
+        return oobData?.roomId;
+    }
+}
diff --git a/src/hooks/useCall.ts b/src/hooks/useCall.ts
index 687b7c014e..db0660df2b 100644
--- a/src/hooks/useCall.ts
+++ b/src/hooks/useCall.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 { useState, useCallback, useMemo } from "react";
+import { useState, useCallback, useMemo, useEffect } from "react";
 
 import type { RoomMember } from "matrix-js-sdk/src/matrix";
 import { type Call, ConnectionState, CallEvent } from "../models/Call";
@@ -20,6 +20,12 @@ export const useCall = (roomId: string): Call | null => {
     useEventEmitter(CallStore.instance, CallStoreEvent.Call, (call: Call | null, forRoomId: string) => {
         if (forRoomId === roomId) setCall(call);
     });
+
+    // Reset the value when the roomId changes
+    useEffect(() => {
+        setCall(CallStore.instance.getCall(roomId));
+    }, [roomId]);
+
     return call;
 };
 
diff --git a/src/hooks/useMediaVisible.ts b/src/hooks/useMediaVisible.ts
index e244d500cf..f367e87c4f 100644
--- a/src/hooks/useMediaVisible.ts
+++ b/src/hooks/useMediaVisible.ts
@@ -6,30 +6,52 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { useCallback } from "react";
+import { JoinRule } from "matrix-js-sdk/src/matrix";
 
 import { SettingLevel } from "../settings/SettingLevel";
 import { useSettingValue } from "./useSettings";
 import SettingsStore from "../settings/SettingsStore";
+import { useMatrixClientContext } from "../contexts/MatrixClientContext";
+import { MediaPreviewValue } from "../@types/media_preview";
+import { useRoomState } from "./useRoomState";
+
+const PRIVATE_JOIN_RULES: JoinRule[] = [JoinRule.Invite, JoinRule.Knock, JoinRule.Restricted];
 
 /**
  * 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.
  */
-export function useMediaVisible(eventId: string): [boolean, (visible: boolean) => void] {
-    const defaultShowImages = useSettingValue("showImages", SettingLevel.DEVICE);
-    const eventVisibility = useSettingValue("showMediaEventIds", SettingLevel.DEVICE);
+export function useMediaVisible(eventId?: string, roomId?: string): [boolean, (visible: boolean) => void] {
+    const mediaPreviewSetting = useSettingValue("mediaPreviewConfig", roomId);
+    const client = useMatrixClientContext();
+    const eventVisibility = useSettingValue("showMediaEventIds");
+    const joinRule = useRoomState(client.getRoom(roomId) ?? undefined, (state) => state.getJoinRule());
     const setMediaVisible = useCallback(
         (visible: boolean) => {
             SettingsStore.setValue("showMediaEventIds", null, SettingLevel.DEVICE, {
                 ...eventVisibility,
-                [eventId]: visible,
+                [eventId!]: visible,
             });
         },
         [eventId, eventVisibility],
     );
 
+    const roomIsPrivate = joinRule ? PRIVATE_JOIN_RULES.includes(joinRule) : false;
+
+    const explicitEventVisiblity = eventId ? eventVisibility[eventId] : undefined;
     // Always prefer the explicit per-event user preference here.
-    const imgIsVisible = eventVisibility[eventId] ?? defaultShowImages;
-    return [imgIsVisible, setMediaVisible];
+    if (explicitEventVisiblity !== undefined) {
+        return [explicitEventVisiblity, setMediaVisible];
+    } else if (mediaPreviewSetting.media_previews === MediaPreviewValue.Off) {
+        return [false, setMediaVisible];
+    } else if (mediaPreviewSetting.media_previews === MediaPreviewValue.On) {
+        return [true, setMediaVisible];
+    } else if (mediaPreviewSetting.media_previews === MediaPreviewValue.Private) {
+        return [roomIsPrivate, setMediaVisible];
+    } else {
+        // Invalid setting.
+        console.warn("Invalid media visibility setting", mediaPreviewSetting.media_previews);
+        return [false, setMediaVisible];
+    }
 }
diff --git a/src/hooks/useTransition.ts b/src/hooks/useTransition.ts
deleted file mode 100644
index d5e8df5f5d..0000000000
--- a/src/hooks/useTransition.ts
+++ /dev/null
@@ -1,27 +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.
-*/
-
-// Based on https://stackoverflow.com/a/61680184
-
-import { type DependencyList, useEffect, useRef } from "react";
-
-export const useTransition = <D extends DependencyList>(callback: (...params: D) => void, deps: D): void => {
-    const func = useRef<(...params: D) => void>(callback);
-
-    useEffect(() => {
-        func.current = callback;
-    }, [callback]);
-
-    const args = useRef<D | null>(null);
-
-    useEffect(() => {
-        if (args.current !== null) func.current(...args.current);
-        args.current = deps;
-        // eslint-disable-next-line react-compiler/react-compiler,react-hooks/exhaustive-deps
-    }, deps);
-};
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 16158072ba..c744b2dae8 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -57,6 +57,8 @@
         "create_a_room": "Vytvořit místnost",
         "create_account": "Vytvořit účet",
         "decline": "Odmítnout",
+        "decline_and_block": "Odmítnout a zablokovat",
+        "decline_invite": "Odmítnout pozvání",
         "delete": "Smazat",
         "deny": "Odmítnout",
         "disable": "Zakázat",
@@ -109,7 +111,6 @@
         "react": "Reagovat",
         "refresh": "Obnovit",
         "register": "Zaregistrovat",
-        "reject": "Odmítnout",
         "reload": "Znovu načíst",
         "remove": "Smazat",
         "rename": "Přejmenovat",
@@ -158,6 +159,7 @@
         "view_message": "Zobrazit zprávu",
         "view_source": "Zobrazit zdroj",
         "yes": "Ano",
+        "yes_dismiss": "Ano, zamítnout",
         "zoom_in": "Přiblížit",
         "zoom_out": "Oddálit"
     },
@@ -387,6 +389,7 @@
             "fallback_button": "Zahájit autentizaci",
             "mas_cross_signing_reset_cta": "Přejděte na svůj účet",
             "mas_cross_signing_reset_description": "Resetujte svou identitu prostřednictvím svého poskytovatele účtu a poté se vraťte a klikněte na \"Opakovat\".",
+            "mas_cross_signing_reset_title": "Přejděte na svůj účet a obnovte svou identitu",
             "msisdn": "Na číslo %(msisdn)s byla odeslána textová zpráva",
             "msisdn_token_incorrect": "Neplatný token",
             "msisdn_token_prompt": "Prosím zadejte kód z této zprávy:",
@@ -488,7 +491,6 @@
         "capabilities": "Schopnosti",
         "copied": "Zkopírováno!",
         "credits": "Poděkování",
-        "cross_signing": "Křížové podepisování",
         "dark": "Tmavý",
         "description": "Popis",
         "deselect_all": "Zrušit výběr všech",
@@ -527,6 +529,7 @@
         "message_timestamp_invalid": "Neplatné časové razítko",
         "microphone": "Mikrofon",
         "model": "Model",
+        "moderation_and_safety": "Moderování a bezpečnost",
         "modern": "Moderní",
         "mute": "Ztlumit",
         "n_members": {
@@ -748,6 +751,13 @@
         "twemoji": "<twemoji>Twemoji</twemoji> emoji grafika je © <author>Twitter, Inc a další přispěvatelé</author> používána za podmínek <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Písmo <colr>twemoji-colr</colr> je © <author>Mozilla Foundation</author> používané za podmínek <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Opravdu chcete odmítnout pozvánku do \"%(roomName)s\"?",
+        "ignore_user_help": "Od tohoto uživatele neuvidíte žádné zprávy ani pozvánky do místnosti.",
+        "reason_description": "Popište důvod nahlášení místnosti.",
+        "report_room_description": "Nahlaste tuto místnost svému poskytovateli účtu.",
+        "title": "Odmítnout pozvání"
+    },
     "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktivní widgety",
@@ -833,8 +843,7 @@
         "room_status": "Stav místnosti",
         "room_unread_status_count": {
             "one": "Stav nepřečtení místnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>",
-            "few": "",
-            "other": "Stav nepřečtení místnosti: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>"
+            "other": "Stav nepřečtení místností: <strong>%(status)s</strong>, počet: <strong>%(count)s</strong>"
         },
         "save_setting_values": "Uložit hodnoty nastavení",
         "see_history": "Prohlédnout historii",
@@ -849,6 +858,9 @@
         "setting_colon": "Nastavení:",
         "setting_definition": "Definice nastavení:",
         "setting_id": "ID nastavení",
+        "settings": {
+            "elementCallUrl": "Element Call URL"
+        },
         "settings_explorer": "Průzkumník nastavení",
         "show_hidden_events": "Zobrazovat v časové ose skryté události",
         "spaces": {
@@ -901,44 +913,25 @@
     "empty_room_was_name": "Prázdná místnost (dříve %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Pro pokračování zadejte bezpečnostní frázi nebo <button>klíč pro obnovení</button>.",
+            "alternatives": "Pokud máte bezpečnostní klíč nebo bezpečnostní frázi, bude to také fungovat.",
             "key_validation_text": {
-                "invalid_security_key": "Neplatný klíč pro obnovení",
-                "recovery_key_is_correct": "To vypadá dobře!",
-                "wrong_file_type": "Špatný typ souboru",
-                "wrong_security_key": "Špatný klíč pro obnovení"
+                "wrong_security_key": "Zadaný klíč pro obnovení není správný."
             },
-            "reset_title": "Resetovat vše",
-            "reset_warning_1": "Udělejte to, pouze pokud nemáte žádné jiné zařízení, se kterým byste mohli dokončit ověření.",
-            "reset_warning_2": "Pokud vše resetujete, začnete bez důvěryhodných relací, bez důvěryhodných uživatelů a možná nebudete moci zobrazit minulé zprávy.",
+            "privacy_warning": "Ujistěte se, že tuto obrazovku nikdo nevidí!",
             "restoring": "Obnovení klíčů ze zálohy",
-            "security_key_title": "Klíč pro obnovení",
-            "security_phrase_incorrect_error": "Nelze získat přístup k zabezpečenému úložišti. Ověřte, zda jste zadali správnou bezpečnostní frázi.",
-            "security_phrase_title": "Bezpečnostní fráze",
-            "separator": "%(securityKey)s nebo %(recoveryFile)s",
-            "use_security_key_prompt": "Pokračujte pomocí klíče pro obnovení."
+            "security_key_title": "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_not_ready": "Křížové podepisování není nastaveno.",
-        "cross_signing_ready": "Křížové podepisování je připraveno k použití.",
-        "cross_signing_ready_no_backup": "Křížové podepisování je připraveno, ale klíče nejsou zálohovány.",
         "cross_signing_room_normal": "Místnost je koncově šifrovaná",
         "cross_signing_room_verified": "V této místnosti jsou všichni ověřeni",
         "cross_signing_room_warning": "Někdo používá neznámou relaci",
-        "cross_signing_unsupported": "Váš domovský server nepodporuje křížové 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.",
         "cross_signing_user_normal": "Tohoto uživatele jste neověřili.",
         "cross_signing_user_verified": "Tohoto uživatele jste ověřili a on ověřil všechny své relace.",
         "cross_signing_user_warning": "Tento uživatel zatím neověřil všechny své relace.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Smazat klíče pro křížové podepisování",
-            "title": "Nenávratně smazat klíče pro křížové podepisování?",
-            "warning": "Smazání klíčů pro křížové podepisování je definitivní. Každý, kdo vás ověřil, teď uvidí bezpečnostní varování. Pokud jste zrovna neztratili všechna zařízení, ze kterých se můžete ověřit, tak to asi nechcete udělat."
-        },
         "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_key": "Šifrované neověřenou relací",
@@ -965,7 +958,6 @@
             "title": "Nový způsob obnovy",
             "warning": "Pokud jste nenastavili nový způsob obnovy 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í."
         },
-        "not_supported": "<nepodporováno>",
         "pinned_identity_changed": "Identita %(displayName)s (<b>%(userId)s</b>) se změnila. <a>Další informace</a>",
         "pinned_identity_changed_no_displayname": "Identita uživatele <b>%(userId)s</b> se změnila. <a>Další informace</a>",
         "recovery_method_removed": {
@@ -981,9 +973,10 @@
         "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.",
-            "title": "Nastavit"
+            "explainer": "Před odhlášením si zazálohujte klíče abyste o ně nepřišli."
         },
+        "turn_on_key_storage": "Zapnout úložiště klíčů",
+        "turn_on_key_storage_description": "Bezpečně uložte svou kryptografickou identitu a klíče zpráv na serveru. To vám umožní zobrazit historii zpráv na všech nových zařízeních.",
         "udd": {
             "interactive_verification_button": "Interaktivní ověření pomocí emoji",
             "other_ask_verify_text": "Požádejte tohoto uživatele, aby ověřil svou relaci, nebo jí níže můžete ověřit manuálně.",
@@ -997,7 +990,6 @@
             "accepting": "Přijímání…",
             "after_new_login": {
                 "device_verified": "Zařízení ověřeno",
-                "reset_confirmation": "Opravdu chcete resetovat ověřovací klíče?",
                 "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í"
@@ -1068,11 +1060,9 @@
             "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_reset_warning_1": "Resetování ověřovacích klíčů nelze vrátit zpět. Po jejich resetování nebudete mít přístup ke starým zašifrovaným zprávám a všem přátelům, kteří vás dříve ověřili, se zobrazí bezpečnostní varování, dokud se u nich znovu neověříte.",
-            "verify_reset_warning_2": "Pokračujte pouze v případě, že jste si jisti, že jste ztratili všechna ostatní zařízení a klíč pro obnovení.",
             "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ěřit pomocí klíče pro obnovení nebo fráze",
+            "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)…",
@@ -1138,11 +1128,7 @@
             "title": "Nelze zkopírovat odkaz na místnost"
         },
         "error_loading_user_profile": "Nepovedlo se načíst profil uživatele",
-        "forget_room_failed": "Nepodařilo se zapomenout místnost %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
-            "title": "Vyhledávání selhalo"
-        }
+        "forget_room_failed": "Nepodařilo se zapomenout místnost %(errCode)s"
     },
     "error_user_not_logged_in": "Uživatel není přihlášen",
     "event_preview": {
@@ -1678,6 +1664,7 @@
         "class_global": "Globální",
         "class_other": "Další možnosti",
         "default": "Výchozí",
+        "default_settings": "Shoda výchozího nastavení",
         "email_pusher_app_display_name": "E-mailová oznámení",
         "enable_prompt_toast_description": "Povolit oznámení na ploše",
         "enable_prompt_toast_title": "Oznámení",
@@ -1696,7 +1683,8 @@
         "mentions_and_keywords_description": "Dostávat oznámení pouze o zmínkách a klíčových slovech podle <a>nastavení</a>",
         "mentions_keywords": "Zmínky a klíčová slova",
         "message_didnt_send": "Zpráva se neodeslala. Klikněte pro informace.",
-        "mute_description": "Nebudete dostávat žádná oznámení"
+        "mute_description": "Nebudete dostávat žádná oznámení",
+        "mute_room": "Ztlumit místnost"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s žádá o ověření"
@@ -1798,11 +1786,6 @@
         "ongoing": "Odstaňování…",
         "reason_label": "Důvod (volitelné)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Opravdu chcete odmítnout pozvání?",
-        "failed": "Nepodařilo se odmítnout pozvání",
-        "title": "Odmítnout pozvání"
-    },
     "report_content": {
         "description": "Nahlášení této zprávy pošle její jedinečné 'event ID' správci vašeho domovského serveru. Pokud jsou zprávy šifrované, správce nebude mít možnost přečíst text zprávy ani se podívat na soubory nebo obrázky.",
         "disagree": "Nesouhlasím",
@@ -1826,10 +1809,8 @@
         "toxic_behaviour": "Nevhodné chování"
     },
     "report_room": {
-        "description": "Nahlaste tuto místnost správci domovského serveru. Tím se odešle jedinečné ID místnosti, ale pokud jsou zprávy zašifrovány, správce je nebude moci číst ani zobrazit sdílené soubory.",
-        "reason_placeholder": " Důvod nahlášení...",
-        "sent": "Vaše hlášení bylo odesláno.",
-        "title": "Nahlášení místnosti"
+        "description": "Nahlaste tuto místnost svému poskytovateli účtu. Pokud jsou zprávy zašifrované, váš administrátor je nebude moci číst.",
+        "reason_label": "Popište důvod"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Nepovedlo se rozšifrovat %(failedCount)s sezení!",
@@ -2015,7 +1996,6 @@
             "you_created": "Vytvořili jste tuto místnost."
         },
         "invite_email_mismatch_suggestion": "Sdílet tento e-mail v nastavení, abyste mohli dostávat pozvánky přímo v %(brand)su.",
-        "invite_reject_ignore": "Odmítnout a ignorovat uživatele",
         "invite_sent_to_email": "Tato pozvánka byla odeslána na adresu %(email)s",
         "invite_sent_to_email_room": "Pozvánka do %(roomName)s byla odeslána na adresu %(email)s",
         "invite_subtitle": "Pozván od <userName/>",
@@ -2113,6 +2093,7 @@
             },
             "uploading_single_file": "Nahrávání %(filename)s"
         },
+        "video_room": "Tato místnost je video místnost",
         "waiting_for_join_subtitle": "Jakmile se pozvaní uživatelé připojí k %(brand)s, budete moci chatovat a místnost bude koncově šifrovaná",
         "waiting_for_join_title": "Čekání na připojení uživatelů k %(brand)s"
     },
@@ -2127,11 +2108,14 @@
             "no_chats_description_no_room_rights": "Začněte tím, že někomu pošlete zprávu",
             "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_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 filtry, abyste viděli své další chaty",
+            "no_people_description": "Můžete zrušit výběr filtrů, abyste viděli ostatní chaty",
             "no_rooms": "Ještě nejste v žádné místnosti",
-            "no_rooms_description": "Můžete zrušit filtry, abyste viděli své další chaty",
+            "no_rooms_description": "Můžete zrušit výběr filtrů, abyste viděli své další chaty",
             "no_unread": "Gratulujeme! Nemáte žádné nepřečtené zprávy",
+            "show_activity": "Zobrazit veškerou aktivitu",
             "show_chats": "Zobrazit všechny chaty"
         },
         "failed_add_tag": "Nepodařilo se přidat štítek %(tagName)s k místnosti",
@@ -2139,6 +2123,8 @@
         "failed_set_dm_tag": "Nepodařilo se nastavit značku přímé zprávy",
         "filters": {
             "favourite": "Oblíbené",
+            "invites": "Pozvánky",
+            "mentions": "Zmínky",
             "people": "Lidé",
             "rooms": "Místnosti",
             "unread": "Nepřečtené"
@@ -2169,15 +2155,21 @@
             "more_options": "Více možností",
             "open_room": "Otevřít místnost %(roomName)s"
         },
+        "room_options": "Možnosti místnosti",
         "show_less": "Zobrazit méně",
         "show_n_more": {
             "other": "Zobrazit %(count)s dalších",
             "one": "Zobrazit %(count)s další"
         },
         "show_previews": "Zobrazovat náhledy zpráv",
+        "sort": "Řadit",
         "sort_by": "Řadit dle",
         "sort_by_activity": "Aktivity",
         "sort_by_alphabet": "A–Z",
+        "sort_type": {
+            "activity": "Aktivita",
+            "atoz": "A–Z"
+        },
         "sort_unread_first": "Zobrazovat místnosti s nepřečtenými zprávami jako první",
         "space_menu": {
             "home": "Domov prostoru",
@@ -2465,6 +2457,10 @@
         "recent_changes_heading": "Nedávné změny, které dosud nebyly přijaty",
         "title": "Server neodpovídá"
     },
+    "service_worker_error": {
+        "description": "%(brand)s vyžaduje service worker pro načítání ověřených médií z úložiště obsahu Matrixu. Váš prohlížeč to nepodporuje, takže může dojít k selhání načtení médií.",
+        "title": "Nepodařilo se načíst service worker"
+    },
     "seshat": {
         "error_initialising": "Inicializace vyhledávání zpráv se nezdařila, zkontrolujte <a>svá nastavení</a>",
         "reset_button": "Resetovat úložiště událostí",
@@ -2543,6 +2539,7 @@
                 "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_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.",
                 "details_title": "Podrobnosti o šifrování",
                 "do_not_close_warning": "Nezavírejte toto okno, dokud není resetování dokončeno",
@@ -2557,6 +2554,8 @@
                 "session_key": "Klíč relace:",
                 "title": "Rozšířené"
             },
+            "confirm_key_storage_off": "Opravdu chcete ponechat úložiště klíčů vypnuté?",
+            "confirm_key_storage_off_description": "Pokud se odhlásíte ze všech svých zařízení, ztratíte historii zpráv a budete muset znovu ověřit všechny své stávající kontakty. <a>Další informace</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Smazat úložiště klíčů",
                 "confirm": "Smazat úložiště klíčů",
@@ -2585,7 +2584,7 @@
                 "enter_key_error": "Zadaný klíč pro obnovení není správný.",
                 "enter_recovery_key": "Zadejte klíč pro obnovení",
                 "forgot_recovery_key": "Zapomněli jste klíč pro obnovení?",
-                "key_storage_warning": "Vaše úložiště klíčů není synchronizováno. Kliknutím na jedno z níže uvedených tlačítek problém vyřešte.",
+                "key_storage_warning": "Vaše úložiště klíčů není synchronizováno. Klikněte na jedno z níže uvedených tlačítek a problém vyřešte.",
                 "save_key_description": "Nesdílejte ho s nikým!",
                 "save_key_title": "Klíč pro obnovení",
                 "set_up_recovery": "Nastavení obnovy",
@@ -2642,6 +2641,7 @@
             "discovery_needs_terms_title": "Umožněte lidem, aby vás našli",
             "display_name": "Zobrazovaný název",
             "display_name_error": "Nelze nastavit zobrazovaný název",
+            "email_adding_unsupported_by_hs": "Tento domovský server nepodporuje přidávání e-mailových adres do vašeho účtu.",
             "email_address_in_use": "Tato e-mailová adresa je již používána",
             "email_address_label": "E-mailová adresa",
             "email_not_verified": "Vaše e-mailová adresa ještě nebyla ověřena",
@@ -2666,7 +2666,9 @@
             "error_share_msisdn_discovery": "Nepovedlo se nasdílet telefonní číslo",
             "identity_server_no_token": "Nebyl nalezen žádný přístupový token identity",
             "identity_server_not_set": "Server identit není nastaven",
+            "invalid_phone_number": "Zadané telefonní číslo se nezdá být platné.",
             "language_section": "Jazyk",
+            "msisdn_adding_unsupported_by_hs": "Tento domovský server nepodporuje přidávání telefonních čísel do vašeho účtu.",
             "msisdn_in_use": "Toto telefonní číslo je již používáno",
             "msisdn_label": "Telefonní číslo",
             "msisdn_verification_field_label": "Ověřovací kód",
@@ -2685,12 +2687,10 @@
             "unable_to_load_msisdns": "Nelze načíst telefonní čísla",
             "username": "Uživatelské jméno"
         },
-        "image_thumbnails": "Zobrazovat náhledy obrázků",
         "inline_url_previews_default": "Nastavit povolení náhledů URL adres jako výchozí",
         "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_avatars": "Zobrazit avatary místností, do kterých jste byli pozváni",
         "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).",
@@ -2709,7 +2709,7 @@
                 "enter_phrase_title": "Zadání bezpečnostní fráze",
                 "enter_phrase_to_confirm": "Zadejte bezpečnostní frázi podruhé a potvrďte ji.",
                 "generate_security_key_description": "Vygenerujeme klíč pro obnovení, který můžete uložit někde v bezpečí, jako je správce hesel nebo trezor.",
-                "generate_security_key_title": "Vygenerovat klíč pro obnovení",
+                "generate_security_key_title": "Vygenerujte klíč pro obnovení",
                 "pass_phrase_match_failed": "To nesedí.",
                 "pass_phrase_match_success": "To odpovídá!",
                 "phrase_strong_enough": "Skvělé! Tato bezpečnostní fráze vypadá dostatečně silně.",
@@ -2718,7 +2718,7 @@
                 "set_phrase_again": "Nastavit heslo znovu.",
                 "settings_reminder": "Zabezpečené zálohování a správu klíčů můžete také nastavit v Nastavení.",
                 "title_confirm_phrase": "Potvrďte bezpečnostní frázi",
-                "title_save_key": "Uložit klíč pro obnovení",
+                "title_save_key": "Uložte si klíč pro obnovení",
                 "title_set_phrase": "Nastavit bezpečnostní frázi",
                 "unable_to_setup": "Nepovedlo se nastavit bezpečné úložiště",
                 "use_different_passphrase": "Použít jinou přístupovou frázi?",
@@ -2749,6 +2749,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Nastavení:</strong> Ignorovaní uživatelé"
         },
+        "media_preview": {
+            "hide_avatars": "Skrýt avatary místnosti a zvoucího",
+            "hide_media": "Vždy skrýt",
+            "media_preview_description": "Skryté médium lze vždy zobrazit klepnutím na něj",
+            "media_preview_label": "Zobrazit média na časové ose",
+            "show_in_private": "V soukromých místnostech",
+            "show_media": "Vždy zobrazit"
+        },
         "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í)",
@@ -2834,57 +2842,20 @@
         "prompt_invite": "Potvrdit odeslání pozvánky potenciálně neplatným Matrix ID",
         "replace_plain_emoji": "Automaticky nahrazovat textové emoji",
         "security": {
-            "4s_public_key_in_account_data": "v datech účtu",
-            "4s_public_key_status": "Veřejný klíč bezpečného úložiště:",
             "analytics_description": "Sdílet anonymní údaje, které nám pomohou identifikovat problémy. Nic osobního. Žádné třetí strany.",
-            "backup_key_cached_status": "Klíč zálohy cachován:",
-            "backup_key_stored_status": "Klíč zálohy uložen:",
-            "backup_key_unexpected_type": "neočekávaný typ",
-            "backup_key_well_formed": "ve správném tvaru",
-            "backup_keys_description": "Zálohujte šifrovací klíče s daty účtu pro případ, že ztratíte přístup k relacím. Vaše klíče budou zabezpečeny jedinečným klíčem pro obnovení.",
             "bulk_options_accept_all_invites": "Přijmout pozvání do všech těchto místností: %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Odmítnutí všech %(invitedRooms)s pozvání",
             "bulk_options_section": "Hromadná možnost",
-            "cross_signing_cached": "uložen lokálně",
-            "cross_signing_homeserver_support": "Funkce podporovaná domovským serverem:",
-            "cross_signing_homeserver_support_exists": "existuje",
-            "cross_signing_in_4s": "v bezpečném úložišti",
-            "cross_signing_in_memory": "v paměti",
-            "cross_signing_master_private_Key": "Hlavní soukromý klíč:",
-            "cross_signing_not_cached": "nenalezen lolálně",
-            "cross_signing_not_found": "nenalezeno",
-            "cross_signing_not_in_4s": "nebylo nalezeno v úložišti",
-            "cross_signing_not_stored": "není uložen",
-            "cross_signing_private_keys": "Soukromé klíče pro křížový podpis:",
-            "cross_signing_public_keys": "Veřejné klíče pro křížový podpis:",
-            "cross_signing_self_signing_private_key": "Vlastní podpisový klíč:",
-            "cross_signing_user_signing_private_key": "Podpisový klíč uživatele:",
-            "cryptography_section": "Šifrování",
             "dehydrated_device_description": "Funkce offline zařízení umožňuje přijímat šifrované zprávy, i když nejste přihlášeni k žádnému zařízení.",
             "dehydrated_device_enabled": "Offline zařízení povoleno",
-            "delete_backup": "Smazat zálohu",
-            "delete_backup_confirm_description": "Opravdu? Pokud klíče nejsou správně zálohované můžete přijít o šifrované zprávy.",
             "dialog_title": "<strong>Nastavení:</strong> Zabezpečení a soukromí",
             "e2ee_default_disabled_warning": "Správce vašeho serveru vypnul ve výchozím nastavení koncové šifrování v soukromých místnostech a přímých zprávách.",
             "enable_message_search": "Povolit vyhledávání v šifrovaných místnostech",
             "encryption_section": "Šifrování",
-            "error_loading_key_backup_status": "Nepovedlo se načíst stav zálohy",
-            "export_megolm_keys": "Exportovat šifrovací klíče místností",
             "ignore_users_empty": "Nemáte žádné ignorované uživatele.",
             "ignore_users_section": "Ignorovaní uživatelé",
-            "import_megolm_keys": "Importovat šifrovací klíče místností",
-            "key_backup_active": "Tato relace zálohuje vaše klíče.",
-            "key_backup_active_version": "Verze aktivní zálohy:",
-            "key_backup_active_version_none": "Žádné",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_can_be_restored": "Tuto zálohu lze obnovit v této relaci",
-            "key_backup_complete": "Všechny klíče jsou zazálohované",
             "key_backup_connect": "Připojit k zálohování klíčů",
-            "key_backup_connect_prompt": "Než se odhlásíte, připojte tuto relaci k záloze klíčů, abyste nepřišli o klíče, které mohou být jen v této relaci.",
-            "key_backup_in_progress": "Zálohování %(sessionsRemaining)s klíčů…",
-            "key_backup_inactive": "Tato relace <b>nezálohuje vaše klíče</b>, ale už máte zálohu ze které je můžete obnovit.",
-            "key_backup_inactive_warning": "Vaše klíče <b>nejsou z této relace zálohovány</b>.",
-            "key_backup_latest_version": "Nejnovější verze zálohy na serveru:",
             "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": {
@@ -2904,13 +2875,7 @@
             "message_search_unsupported": "%(brand)su chybí nějaké komponenty, které jsou potřeba pro vyhledávání v zabezpečených místnostech. Pokud chcete s touto funkcí experimentovat, tak si pořiďte vlastní %(brand)s Desktop s <nativeLink>přidanými komponentami</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s nemůže bezpečně ukládat šifrované zprávy lokálně v prohlížeči. Pro zobrazení šifrovaných zpráv ve výsledcích vyhledávání použijte <desktopLink>%(brand)s Desktop</desktopLink>.",
             "record_session_details": "Zaznamenat název, verzi a url pro snadnější rozpoznání relací ve správci relací",
-            "restore_key_backup": "Obnovit ze zálohy",
-            "secret_storage_not_ready": "nepřipraveno",
-            "secret_storage_ready": "připraveno",
-            "secret_storage_status": "Bezpečné úložiště:",
             "send_analytics": "Odesílat analytická data",
-            "session_id": "ID relace:",
-            "session_key": "Klíč relace:",
             "strict_encryption": "Odesílat zprávy pouze ověřeným uživatelům"
         },
         "send_read_receipts": "Odesílat potvrzení o přečtení",
@@ -3154,8 +3119,6 @@
         "topic": "Nastaví nebo zjistí téma místnosti",
         "topic_none": "Tato místnost nemá žádné specifické téma.",
         "topic_room_error": "Nepodařilo se získat téma místnosti: Nelze najít místnost (%(roomId)s",
-        "tovirtual": "Přepne do virtuální místnosti této místnosti, pokud ji má",
-        "tovirtual_not_found": "Žádná virtuální místnost pro tuto místnost",
         "unban": "Zruší vykázání uživatele s daným identifikátorem",
         "unflip": "Vloží ┬──┬ ノ( ゜-゜ノ) na začátek zprávy",
         "unholdcall": "Zruší podržení hovoru v aktuální místnosti",
@@ -3173,7 +3136,7 @@
         "view": "Zobrazí místnost s danou adresou",
         "whois": "Zobrazuje informace o uživateli"
     },
-    "sliding_sync_legacy_no_longer_supported": "Starší klouzavá synchronizace již není podporována: odhlaste se a znovu přihlaste, abyste povolili nový způsob posuvné synchronizace",
+    "sliding_sync_legacy_no_longer_supported": "Starší klouzavá synchronizace již není podporována: odhlaste se a znovu přihlaste, abyste povolili nový příznak klouzavé synchronizace",
     "space": {
         "add_existing_room_space": {
             "create": "Chcete místo toho přidat novou místnost?",
@@ -3209,7 +3172,7 @@
         "invite_link": "Sdílet odkaz na pozvánku",
         "joining_space": "Připojování",
         "landing_welcome": "Vítejte v <name/>",
-        "leave_dialog_action": "Opusit prostor",
+        "leave_dialog_action": "Opustit prostor",
         "leave_dialog_description": "Odcházíte z <spaceName/>.",
         "leave_dialog_only_admin_room_warning": "Jste jediným správcem některých místností nebo prostorů, které chcete opustit. Jejich opuštěním zůstanou bez správců.",
         "leave_dialog_only_admin_warning": "Jste jediným správcem tohoto prostoru. Jeho opuštění bude znamenat, že nad ním nebude mít nikdo kontrolu.",
@@ -3278,7 +3241,7 @@
         "heading_without_query": "Hledat",
         "join_button_text": "Vstoupit do %(roomAddress)s",
         "keyboard_scroll_hint": "K pohybu použijte <arrows/>",
-        "message_search_section_title": "Další vyhledávání",
+        "messages_label": "Zprávy",
         "other_rooms_in_space": "Další místnosti v %(spaceName)s",
         "public_rooms_label": "Veřejné místnosti",
         "public_spaces_label": "Veřejné prostory",
@@ -3288,7 +3251,6 @@
         "result_may_be_hidden_privacy_warning": "Některé výsledky mohou být z důvodu ochrany soukromí skryté",
         "result_may_be_hidden_warning": "Některé výsledky mohou být skryté",
         "search_dialog": "Dialogové okno hledání",
-        "search_messages_hint": "Pro vyhledávání zpráv hledejte tuto ikonu v horní části místnosti <icon/>",
         "spaces_title": "Prostory, ve kterých se nacházíte",
         "start_group_chat_button": "Zahájit skupinový chat"
     },
@@ -3337,9 +3299,7 @@
     "threads_activity_centre": {
         "header": "Aktivita vláken",
         "no_rooms_with_threads_notifs": "Zatím nemáte k dispozici místnosti s upozorněními na vlákna.",
-        "no_rooms_with_unread_threads": "Zatím nemáte místnosti s nepřečtenými vlákny.",
-        "release_announcement_description": "Oznámení o vláknech se přesunula, od nynějška je najdete zde.",
-        "release_announcement_header": "Centrum aktivity vláken"
+        "no_rooms_with_unread_threads": "Zatím nemáte místnosti s nepřečtenými vlákny."
     },
     "time": {
         "about_day_ago": "před jedním dnem",
@@ -3850,10 +3810,11 @@
         "unavailable": "Nedostupné"
     },
     "update_room_access_modal": {
-        "description": "Chcete-li vytvořit sdílený odkaz, musíte hostům povolit, aby se k této místnosti připojili. Může se tak stát, že místnost bude méně bezpečná. Po dokončení hovoru můžete místnost opět učinit soukromou.",
-        "dont_change_description": "Případně můžete hovor uskutečnit v oddělené místnosti.",
+        "description": "Chcete-li vytvořit sdílený odkaz, nastavte tuto místnost <b>veřejnou</b> nebo povolte možnost, aby uživatelé <b>požádali o vstup</b>. To umožňuje hostům připojit se, aniž by byli pozváni.",
+        "dont_change_description": "Pokud nechcete změnit přístup k této místnosti, můžete pro odkaz na hovor vytvořit novou místnost.",
         "no_change": "Nechci měnit úroveň přístupu.",
-        "title": "Změna úrovně přístupu do místnosti"
+        "revert_access_description": "(Tuto hodnotu lze vrátit na předchozí hodnotu v Nastavení místnosti: <b>Zabezpečení a soukromí</b> / <b>Přístup</b>)",
+        "title": "Povolit hostům vstup do této místnosti"
     },
     "upload_failed_generic": "Soubor '%(fileName)s' se nepodařilo nahrát.",
     "upload_failed_size": "Soubor '%(fileName)s' je větší než povoluje limit domovského serveru",
diff --git a/src/i18n/strings/cy.json b/src/i18n/strings/cy.json
index ff5a3a379b..2255353380 100644
--- a/src/i18n/strings/cy.json
+++ b/src/i18n/strings/cy.json
@@ -3,7 +3,29 @@
         "emoji_picker": "Dewisydd Emoji",
         "jump_first_invite": "Symud i'r gwahoddiad cyntaf.",
         "message_composer": "Neges cyfansoddwr",
+        "n_unread_messages": {
+            "%(count)s neges heb eu darllen": "other",
+            "1 neges heb ei darllen": "one"
+        },
+        "n_unread_messages_mentions": {
+            "%(count)s crybwylliadau heb eu darllen": "zero",
+            "1 crybwylliad heb ei ddarllen": "one",
+            "%(count)s grybwylliad heb eu darllen": "two",
+            "%(count)s crybwylliad heb eu darllen": "other"
+        },
         "recent_rooms": "Ystafelloedd diweddar",
+        "room_messsage_not_sent": "Agor ystafell %(roomName)s gyda neges heb ei gosod.",
+        "room_n_unread_invite": "Agor gwahoddiad i ystafell %(roomName)s.",
+        "room_n_unread_messages": {
+            "Ystafell agored%(roomName)s gyda %(count)s negeseuon heb eu darllen.": "zero",
+            "Ystafell agored %(roomName)s gydag 1 neges heb ei darllen.": "one",
+            "Ystafell agored%(roomName)s gyda %(count)s neges heb eu darllen.": "other"
+        },
+        "room_n_unread_messages_mentions": {
+            "Ystafell agored %(roomName)s gyda %(count)s negeseuon heb eu darllen gan gynnwys crybwylliadau.": "zero",
+            "Ystafell agored %(roomName)s gydag 1 crybwylliad heb ei ddarllen.": "one",
+            "Ystafell agored %(roomName)s gyda %(count)s neges heb eu darllen gan gynnwys crybwylliadau.": "other"
+        },
         "room_name": "Ystafell %(matere)s",
         "room_status_bar": "Bar statws ystafell",
         "seek_bar_label": "Bar chwilio sain",
@@ -37,6 +59,8 @@
         "create_a_room": "Creu ystafell",
         "create_account": "Creu Cyfrif",
         "decline": "Gwrthod",
+        "decline_and_block": "Gwrthod a rhwystro",
+        "decline_invite": "Gwrthod y gwahoddiad",
         "delete": "Dileu",
         "deny": "Gwrthod",
         "disable": "Analluogi",
@@ -89,7 +113,6 @@
         "react": "Ymateb",
         "refresh": "Adnewyddu",
         "register": "Cofrestru",
-        "reject": "Gwrthod",
         "reload": "Ail-lwytho",
         "remove": "Tynnu",
         "rename": "Ailenwi",
@@ -138,6 +161,7 @@
         "view_message": "Gweld neges",
         "view_source": "Gweld Ffynhonnell",
         "yes": "Iawn",
+        "yes_dismiss": "Iawn, diystyru",
         "zoom_in": "Chwyddo mewn",
         "zoom_out": "Chwyddo allan"
     },
@@ -367,6 +391,7 @@
             "fallback_button": "Dechrau dilysu",
             "mas_cross_signing_reset_cta": "Mynd i'ch cyfrif",
             "mas_cross_signing_reset_description": "Ailosodwch eich hunaniaeth trwy ddarparwr eich cyfrif ac yna dewch yn ôl a chlicio \"Ailgynnig\".",
+            "mas_cross_signing_reset_title": "Ewch i'ch cyfrif i ailosod eich hunaniaeth",
             "msisdn": "Mae neges destun wedi'i hanfon at %(msisdn)s",
             "msisdn_token_incorrect": "Tocyn yn anghywir",
             "msisdn_token_prompt": "Rhowch y cod sydd ynddo:",
@@ -464,7 +489,6 @@
         "capabilities": "Gallu",
         "copied": "Wedi'i gopïo!",
         "credits": "Diolchiadau",
-        "cross_signing": "Traws-arwyddo",
         "dark": "Tywyll",
         "description": "Disgrifiad",
         "deselect_all": "Dad-ddewis y cwbl",
@@ -503,6 +527,7 @@
         "message_timestamp_invalid": "Stamp amser annilys",
         "microphone": "Meicroffôn",
         "model": "Model",
+        "moderation_and_safety": "Cymedroli a diogelwch",
         "modern": "Modern",
         "mute": "Tewi",
         "name": "Enw",
@@ -555,7 +580,7 @@
         "system_alerts": "Rhybuddion System",
         "theme": "Thema",
         "thread": "Edefyn",
-        "threads": "Edau",
+        "threads": "Edafedd",
         "timeline": "Llinell Amser",
         "unavailable": "ddim ar gael",
         "unencrypted": "Heb ei amgryptio",
@@ -568,7 +593,7 @@
         "user_avatar": "Llun proffil",
         "username": "Enw defnyddiwr",
         "verification_cancelled": "Dilysiad wedi'i ddiddymu",
-        "verified": "Gwiriwyd",
+        "verified": "Wedi ei wirio",
         "version": "Fersiwn",
         "video": "Fideo",
         "video_room": "Ystafell fideo",
@@ -597,7 +622,7 @@
         "format_inline_code": "Cod",
         "format_insert_link": "Mewnosod dolen",
         "format_italic": "Italig",
-        "format_italics": "Italig",
+        "format_italics": "Italigau",
         "format_link": "Dolen",
         "format_ordered_list": "Rhestr wedi'i rhifo",
         "format_strikethrough": "Llinell Drwodd",
@@ -716,6 +741,13 @@
         "twemoji": "Mae'r celf emoji <twemoji>Twemoji</twemoji> yn ©<author> Twitter, Inc a chyfranwyr eraill</author> sy'n cael ei ddefnyddio dan delerau<terms> CC-BY 4.0</terms>.",
         "twemoji_colr": "Mae'r ffont <colr>twemoji-colr</colr> yn ©<author> Sefydliad Mozilla</author> sy'n cael ei ddefnyddio o dan delerau<terms> Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Ydych chi'n siŵr eich bod am wrthod y gwahoddiad i ymuno â \"%(roomName)s\"?",
+        "ignore_user_help": "Byddwch chi ddim yn gweld unrhyw negeseuon neu wahoddiadau ystafell gan y defnyddiwr hwn.",
+        "reason_description": "Disgrifiwch y rheswm dros adrodd am yr ystafell.",
+        "report_room_description": "Adrodd am yr ystafell hon i ddarparwr eich cyfrif.",
+        "title": "Gwrthod gwahoddiad"
+    },
     "desktop_default_device_name": "Bwrdd gwaith %(brand)s: %(platformName)s",
     "devtools": {
         "active_widgets": "Widgets Actif",
@@ -770,9 +802,9 @@
         "event_id": "ID y digwyddiad: %(eventId)s",
         "event_sent": "Digwyddiad wedi'i anfon!",
         "event_type": "Math o Ddigwyddiad",
-        "explore_account_data": "Archwiliwch ddata cyfrif",
-        "explore_room_account_data": "Archwiliwch ddata cyfrif ystafell",
-        "explore_room_state": "Archwiliwch gyflwr yr ystafell",
+        "explore_account_data": "Archwilio data'r cyfrif",
+        "explore_room_account_data": "Archwilio data cyfrif ystafell",
+        "explore_room_state": "Archwilio cyflwr yr ystafell",
         "failed_to_find_widget": "Bu gwall wrth ddod o hyd i'r teclyn hwn.",
         "failed_to_load": "Wedi methu llwytho.",
         "failed_to_save": "Wedi methu cadw gosodiadau.",
@@ -799,6 +831,14 @@
         "room_notifications_total": "Cyfanswm: ",
         "room_notifications_type": "Math: ",
         "room_status": "Statws ystafell",
+        "room_unread_status_count": {
+            "zero": "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>",
+            "one": "Statws heb ei ddarllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>",
+            "two": "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>",
+            "few": "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>",
+            "many": "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>",
+            "other": "Statws heb eu darllen yn yr ystafell:<strong>%(status)s</strong> , cyfrif:<strong>%(count)s</strong>"
+        },
         "save_setting_values": "Cadw gwerthoedd gosod",
         "see_history": "Gweld hanes",
         "send_custom_account_data_event": "Anfon digwyddiad data cyfrif personol",
@@ -812,10 +852,21 @@
         "setting_colon": "Gosodiad:",
         "setting_definition": "Gosod  diffiniad:",
         "setting_id": "Gosod  ID",
+        "settings": {
+            "elementCallUrl": "URL Galwad Element"
+        },
         "settings_explorer": "Archwiliwr gosodiadau",
         "show_hidden_events": "Dangos digwyddiadau cudd yn y llinell amser",
+        "spaces": {
+            "zero": "<%(count) s gofodau>",
+            "one": "<space>",
+            "two": "<%(count) s ofod>",
+            "few": "<%(count) s gofod>",
+            "many": "<%(count) s gofod>",
+            "other": "<%(count) s gofod>"
+        },
         "state_key": "Allwedd Cyflwr",
-        "thread_root_id": "ID Edau Gwraidd: %(threadRootId)s",
+        "thread_root_id": "ID Gwraidd Edefyn: %(threadRootId)s",
         "threads_timeline": "Llinell amser edafedd",
         "title": "Offer datblygwr",
         "toggle_event": "toglo digwyddiad",
@@ -860,44 +911,23 @@
     "empty_room_was_name": "Ystafell wag (roedd yn %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Rhowch eich Ymadrodd Diogelwch neu <button>defnyddiwch eich Allwedd Adfer</button> i barhau.",
             "key_validation_text": {
-                "invalid_security_key": "Allwedd Adfer Annilys",
-                "recovery_key_is_correct": "Edrych yn dda!",
-                "wrong_file_type": "Math anghywir o ffeil",
                 "wrong_security_key": "Allwedd Adfer Anghywir"
             },
-            "reset_title": "Ailosod popeth",
-            "reset_warning_1": "Gwnewch hyn dim ond os nad oes gennych unrhyw ddyfais arall gyda chi i gwblhau'r dilysu.",
-            "reset_warning_2": "Os byddwch yn ailosod popeth, byddwch yn ailgychwyn heb unrhyw sesiynau dibynadwy, dim defnyddwyr dibynadwy, ac efallai na fyddwch yn gallu gweld negeseuon blaenorol.",
             "restoring": "Adfer allweddi o'r copi wrth gefn",
-            "security_key_title": "Allwedd Adfer",
-            "security_phrase_incorrect_error": "Methu cyrchu storfa gyfrinachol. Gwiriwch eich bod wedi rhoi'r Ymadrodd Diogelwch cywir.",
-            "security_phrase_title": "Ymadrodd Diogelwch",
-            "separator": "%(securityKey)s neu %(recoveryFile)s",
-            "use_security_key_prompt": "Defnyddiwch eich Allwedd Adfer i barhau."
+            "security_key_title": "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_not_ready": "Nid yw traws-arwyddo wedi'i osod.",
-        "cross_signing_ready": "Mae croes-arwyddo yn barod i'w ddefnyddio.",
-        "cross_signing_ready_no_backup": "Mae traws-arwyddo yn barod ond nid oes copïau wrth gefn o'r allweddi.",
         "cross_signing_room_normal": "Mae'r ystafell hon wedi'i hamgryptio o ben-i-ben",
         "cross_signing_room_verified": "Mae pawb yn yr ystafell hon wedi'u gwirio",
         "cross_signing_room_warning": "Mae rhywun yn defnyddio sesiwn anhysbys",
-        "cross_signing_unsupported": "Nid yw eich gweinydd cartref yn cefnogi croeslofnodi.",
-        "cross_signing_untrusted": "Mae gan eich cyfrif hunaniaeth traws-lofnodi mewn storfa gyfrinachol, ond nid yw'r sesiwn hon yn ymddiried ynddo eto.",
         "cross_signing_user_normal": "Nid ydych wedi gwirio'r defnyddiwr hwn.",
         "cross_signing_user_verified": "Rydych chi wedi gwirio'r defnyddiwr hwn. Mae'r defnyddiwr hwn wedi gwirio eu holl sesiynau.",
         "cross_signing_user_warning": "Nid yw'r defnyddiwr hwn wedi gwirio eu holl sesiynau.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Allweddi traws-arwyddo clir",
-            "title": "Dinistrio allweddi croes-arwyddo?",
-            "warning": "Mae dileu allweddi traws-arwyddo yn barhaol. Bydd unrhyw un yr ydych wedi gwirio gyda nhw yn gweld rhybuddion diogelwch. Mae bron yn sicr nad ydych am wneud hyn, oni bai eich bod wedi colli pob dyfais y gallwch groes-arwyddo ohoni."
-        },
         "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_key": "Wedi'i amgryptio gan sesiwn heb ei wirio",
@@ -924,9 +954,8 @@
             "title": "Dull Adfer Newydd",
             "warning": "Os na wnaethoch chi osod y dull adfer newydd, 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."
         },
-        "not_supported": "<not supported>",
-        "pinned_identity_changed": "Mae'n ymddangos bod hunaniaeth %(displayName)s ( <b>%(userId)s</b> ) wedi newid. <a>Dysgu rhagor</a>",
-        "pinned_identity_changed_no_displayname": "Mae'n ymddangos bod hunaniaeth <b>%(userId)s</b> wedi newid. <a>Dysgu rhagor</a>",
+        "pinned_identity_changed": "Cafodd hunaniaeth (<b>%(userId)s</b>) %(displayName)s ei ailosod. <a>Dysgu rhagor</a>",
+        "pinned_identity_changed_no_displayname": "Cafodd hunaniaeth <b>%(userId)s</b> ei ailosod. <a>Dysgu rhagor</a>",
         "recovery_method_removed": {
             "description_1": "Mae'r sesiwn hon wedi canfod bod eich Ymadrodd Diogelwch a'ch allwedd ar gyfer Negeseuon Diogel wedi'u dileu.",
             "description_2": "Os gwnaethoch hyn yn ddamweiniol, gallwch osod Negeseuon Diogel ar y sesiwn hon a fydd yn ail-amgryptio hanes negeseuon y sesiwn hon gyda dull adfer newydd.",
@@ -940,9 +969,10 @@
         "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.",
-            "title": "Gosod"
+            "explainer": "Gwnewch gopi wrth gefn o'ch allweddi cyn allgofnodi er mwyn osgoi eu colli."
         },
+        "turn_on_key_storage": "Troi storfa allweddi ymlaen",
+        "turn_on_key_storage_description": "Cadwch eich hunaniaeth cryptograffig a'ch allweddi neges yn ddiogel ar y gweinydd. Bydd hyn yn caniatáu ichi weld hanes eich neges ar unrhyw ddyfeisiau newydd. %1$s.",
         "udd": {
             "interactive_verification_button": "Dilyswch yn rhyngweithiol trwy emoji",
             "other_ask_verify_text": "Gofynnwch i'r defnyddiwr hwn wirio ei sesiwn, neu ei wirio â llaw isod.",
@@ -956,7 +986,6 @@
             "accepting": "Yn derbyn…",
             "after_new_login": {
                 "device_verified": "Dyfais wedi'i dilysu",
-                "reset_confirmation": "Ailosod allweddi dilysu mewn gwirionedd?",
                 "skip_verification": "Hepgor dilysu am y tro",
                 "unable_to_verify": "Methu â gwirio'r ddyfais hon",
                 "verify_this_device": "Dilyswch y ddyfais hon"
@@ -1027,8 +1056,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_reset_warning_1": "Nid oes modd dadwneud ailosod eich allweddi dilysu. Ar ôl ailosod, ni fydd gennych fynediad i hen negeseuon wedi'u hamgryptio, a bydd unrhyw ffrindiau sydd wedi'ch dilysu o'r blaen yn gweld rhybuddion diogelwch nes i chi ail-ddilysu gyda nhw.",
-            "verify_reset_warning_2": "Mynd ymlaen dim ond os ydych yn siŵr eich bod wedi colli eich holl ddyfeisiau eraill a'ch Allwedd Adfer.",
             "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",
@@ -1038,8 +1065,8 @@
             "waiting_other_user": "Yn aros i %(displayName)s wirio…"
         },
         "verification_requested_toast_title": "Gofynnwyd am ddilysiad",
-        "verified_identity_changed": "Mae hunaniaeth %(displayName)s ( <b>%(userId)s</b> ) a ddilyswyd wedi newid. <a>Dysgu rhagor</a>",
-        "verified_identity_changed_no_displayname": "Mae hunaniaeth ddilysedig <b>%(userId)s</b> wedi newid. <a>Dysgu rhagor</a>",
+        "verified_identity_changed": "Cafodd hunaniaeth (<b>%(userId)s</b>) %(displayName)s ei ailosod. <a>Dysgu rhagor</a>",
+        "verified_identity_changed_no_displayname": "Cafodd hunaniaeth <b>%(userId)s</b> ei ailosod. <a>Dysgu rhagor</a>",
         "verify_toast_description": "Efallai na fydd defnyddwyr eraill yn ymddiried ynddo",
         "verify_toast_title": "Gwiriwch y sesiwn hon",
         "withdraw_verification_action": "Tynnu'r dilysiad yn ôl"
@@ -1097,11 +1124,7 @@
             "title": "Methu â chopïo dolen ystafell"
         },
         "error_loading_user_profile": "Methu llwytho proffil defnyddiwr",
-        "forget_room_failed": "Wedi methu ag anghofio ystafell %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Mae'n bosib nad yw'r gweinydd ar gael, wedi ei orlwytho, neu fod y chwilio wedi dod i ben :(",
-            "title": "Methodd y chwilio"
-        }
+        "forget_room_failed": "Wedi methu ag anghofio ystafell %(errCode)s"
     },
     "error_user_not_logged_in": "Nid yw'r defnyddiwr wedi mewngofnodi",
     "event_preview": {
@@ -1148,7 +1171,39 @@
         "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": {
+            "zero": "Wedi nôl %(count)s digwyddiadau o fewn %(seconds)s e",
+            "one": "Wedi allforio %(count)s digwyddiad o fewn %(seconds)s e",
+            "two": "Wedi nôl %(count)s ddigwyddiad o fewn %(seconds)s e",
+            "few": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e",
+            "many": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e",
+            "other": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e"
+        },
         "exporting_your_data": "Allforio eich data",
+        "fetched_n_events": {
+            "zero": "Wedi nôl %(count)s digwyddiadau hyd yn hyn",
+            "one": "Wedi nôl %(count)s digwyddiad hyd yn hyn",
+            "two": "Wedi nôl %(count)s ddigwyddiad hyd yn hyn",
+            "few": "Wedi nôl %(count)s digwyddiad hyd yn hyn",
+            "many": "Wedi nôl %(count)s digwyddiad hyd yn hyn",
+            "other": "Wedi nôl %(count)s digwyddiad hyd yn hyn"
+        },
+        "fetched_n_events_in_time": {
+            "zero": "Wedi nôl %(count)s digwyddiadau o fewn %(seconds)s e",
+            "one": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e",
+            "two": "Wedi nôl %(count)s ddigwyddiad o fewn %(seconds)s e",
+            "few": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e",
+            "many": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e",
+            "other": "Wedi nôl %(count)s digwyddiad o fewn %(seconds)s e"
+        },
+        "fetched_n_events_with_total": {
+            "zero": "Wedi nôl %(count)s digwyddiadau allan o %(total)s",
+            "one": "Wedi nôl %(count)s digwyddiad allan o %(total)s",
+            "two": "Wedi nôl %(count)s ddigwyddiad allan o %(total)s",
+            "few": "Wedi nôl %(count)s digwyddiad allan o %(total)s",
+            "many": "Wedi nôl %(count)s digwyddiad allan o %(total)s",
+            "other": "Wedi nôl %(count)s digwyddiad allan o %(total)s"
+        },
         "fetching_events": "Wrthi'n nôl digwyddiadau…",
         "file_attached": "Ffeil wedi'i Atodi",
         "format": "Fformat",
@@ -1261,8 +1316,8 @@
         "explainer": "Mae rheolwyr integreiddio yn derbyn data ffurfweddu, a gallant addasu teclynnau, anfon gwahoddiadau ystafell, a gosod lefelau pŵer ar eich rhan.",
         "manage_title": "Rheoli integreiddiadau",
         "toggle_label": "Galluogi'r rheolwr integreiddio",
-        "use_im": "Defnyddiwch reolwr integreiddio i reoli bots, teclynnau a phecynnau sticeri.",
-        "use_im_default": "Defnyddiwch reolwr integreiddio <b>(%(serverName)s)</b> i reoli bots, teclynnau a phecynnau sticeri."
+        "use_im": "Defnyddiwch reolwr integreiddio i reoli botiau, teclynnau a phecynnau sticeri.",
+        "use_im_default": "Defnyddiwch reolwr integreiddio <b>(%(serverName)s)</b> i reoli botiau, teclynnau a phecynnau sticeri."
     },
     "integrations": {
         "disabled_dialog_description": "Galluogi '%(manageIntegrations)s' yn y Gosodiadau i wneud hyn.",
@@ -1408,7 +1463,7 @@
         "beta_feature": "Mae hon yn nodwedd beta",
         "beta_feedback_leave_button": "I adael y beta, ewch i'ch gosodiadau.",
         "beta_feedback_title": "Adborth beta %(featureName)s",
-        "beta_section": "Nodweddion sydd ar ddod",
+        "beta_section": "Nodweddion sy ar eu ffordd",
         "bridge_state": "Dangos gwybodaeth am bontydd mewn gosodiadau ystafell",
         "bridge_state_channel": "Sianel:<channelLink/>",
         "bridge_state_creator": "Darparwyd y bont hon gan<user />.",
@@ -1437,7 +1492,7 @@
         "group_rooms": "Ystafelloedd",
         "group_spaces": "Gofodau",
         "group_themes": "Themâu",
-        "group_threads": "Edau",
+        "group_threads": "Edafedd",
         "group_ui": "Rhyngwyneb",
         "group_voip": "Llais a Fideo",
         "group_widgets": "Teclynnau",
@@ -1445,7 +1500,7 @@
         "html_topic": "Dangos cynrychiolaeth HTML o bynciau ystafell",
         "join_beta": "Ymunwch â'r beta",
         "join_beta_reload": "Bydd ymuno â'r beta yn ail-lwytho %(brand)s.",
-        "jump_to_date": "Symud i ddyddiad (ychwanegu / jumtodate a neidio i benynnau dyddiad)",
+        "jump_to_date": "Symud i ddyddiad (ychwanegu / jumtodate a symud i benynnau dyddiad)",
         "jump_to_date_msc_support": "Mae angen i'ch gweinydd gefnogi MSC3030",
         "latex_maths": "Rendro mathemateg LaTeX mewn negeseuon",
         "leave_beta": "Gadael y beta",
@@ -1604,6 +1659,7 @@
         "class_global": "Eang",
         "class_other": "Arall",
         "default": "Rhagosodedig",
+        "default_settings": "Cydweddu'r gosodiadau rhagosodedig",
         "email_pusher_app_display_name": "Hysbysiadau E-bost",
         "enable_prompt_toast_description": "Galluogi hysbysiadau bwrdd gwaith",
         "enable_prompt_toast_title": "Hysbysiadau",
@@ -1620,23 +1676,24 @@
         "mark_all_read": "Marcio'r cyfan wedi'u darllen",
         "mentions_and_keywords": "@crybwylliadau ac allweddeiriau",
         "mentions_and_keywords_description": "Dim ond gyda chyfeiriadau ac allweddeiriau fel y'u gosodwyd yn eich <a>gosodiadau</a> y cewch eich hysbysu",
-        "mentions_keywords": "Crybwyll ac allweddeiriau",
+        "mentions_keywords": "Crybwylliadau ac allweddeiriau",
         "message_didnt_send": "Heb anfon y neges. Cliciwch am wybodaeth.",
-        "mute_description": "Fyddwch chi ddim yn cael unrhyw hysbysiadau"
+        "mute_description": "Fyddwch chi ddim yn cael unrhyw hysbysiadau",
+        "mute_room": "Tewi'r ystafell"
     },
     "notifier": {
         "m.key.verification.request": "Mae %(matere)s yn gofyn am ddilysiad"
     },
     "onboarding": {
         "create_room": "Creu Sgwrs Grŵp",
-        "explore_rooms": "Archwiliwch Ystafelloedd Cyhoeddus",
+        "explore_rooms": "Archwilio Ystafelloedd Cyhoeddus",
         "has_avatar_label": "Gwych, bydd hynny'n helpu pobl i wybod mai chi ydyw",
         "intro_byline": "Yn berchen ar eich sgyrsiau.",
         "intro_welcome": "Croeso i %(appName)s",
         "no_avatar_label": "Ychwanegwch lun fel bod pobl yn gwybod mai chi sydd yno.",
         "send_dm": "Anfon Neges Uniongyrchol",
         "welcome_detail": "Nawr, gadewch i ni eich helpu i ddechrau",
-        "welcome_user": "Croeso %(matere)s"
+        "welcome_user": "Croeso %(name)s"
     },
     "pill": {
         "permalink_other_room": "Neges yn %(room)s",
@@ -1716,11 +1773,6 @@
         "ongoing": "Wrthi'n tynnu…",
         "reason_label": "Rheswm (dewisol)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ydych chi'n siŵr eich bod am wrthod y gwahoddiad?",
-        "failed": "Wedi methu â gwrthod gwahoddiad",
-        "title": "Gwrthod gwahoddiad"
-    },
     "report_content": {
         "description": "Bydd adrodd y neges hon yn anfon ei 'ID digwyddiad' unigryw at weinyddwr eich gweinyddwr cartref. Os yw negeseuon yn yr ystafell hon wedi'u hamgryptio, ni fydd gweinyddwr eich gweinydd cartref yn gallu darllen testun y neges na gweld unrhyw ffeiliau neu ddelweddau.",
         "disagree": "Anghytuno",
@@ -1745,9 +1797,7 @@
     },
     "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.",
-        "reason_placeholder": " Rheswm dros adrodd...",
-        "sent": "Anfonwyd eich adroddiad.",
-        "title": "Ystafell Adrodd"
+        "reason_label": "Disgrifiwch y rheswm"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Wedi methu â dadgryptio %(failedCount)s sesiwn!",
@@ -1777,7 +1827,7 @@
         "add_topic": "Ychwanegu pwnc",
         "extensions_button": "Estyniadau",
         "extensions_empty_description": "Dewiswch “%(addIntegrations)s” i bori ac ychwanegu estyniadau i'r ystafell hon",
-        "extensions_empty_title": "Rhowch hwb i gynhyrchiant gyda mwy o offer, teclynnau a bots",
+        "extensions_empty_title": "Rhowch hwb i gynhyrchiant gyda mwy o offer, teclynnau a botiau",
         "files_button": "Ffeiliau",
         "pinned_messages": {
             "empty_description": "Dewiswch neges a dewiswch “%(pinAction)s” i'w chynnwys yma.",
@@ -1788,7 +1838,7 @@
                 "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"
             },
-            "reply_thread": "Ymateb i a <link>neges edau</link>",
+            "reply_thread": "Ymateb i a <link>neges edefyn</link>",
             "unpin_all": {
                 "button": "Dad-binio pob neges",
                 "content": "Gwnewch yn siŵr eich bod chi wir eisiau dileu'r holl negeseuon sydd wedi'u pinio. Nid oes modd dadwneud y weithred hon.",
@@ -1814,7 +1864,7 @@
             "title": "Manylion yr ystafell"
         },
         "thread_list": {
-            "context_menu_label": "Dewisiadau edau"
+            "context_menu_label": "Dewisiadau edafedd"
         },
         "video_room_chat": {
             "title": "Sgwrs"
@@ -1900,7 +1950,6 @@
             "you_created": "Chi sydd wedi creu'r ystafell hon."
         },
         "invite_email_mismatch_suggestion": "Rhannwch yr e-bost hwn yn y Gosodiadau i dderbyn gwahoddiadau yn uniongyrchol yn %(brand)s.",
-        "invite_reject_ignore": "Gwrthod ac Anwybyddu defnyddiwr",
         "invite_sent_to_email": "Anfonwyd y gwahoddiad hwn at %(email)s",
         "invite_sent_to_email_room": "Anfonwyd y gwahoddiad hwn i %(roomName)s at %(email)s",
         "invite_subtitle": "Gwahoddwyd gan <userName/>",
@@ -1984,6 +2033,7 @@
         "upload": {
             "uploading_single_file": "Wrthi'n llwytho %(filematere)s"
         },
+        "video_room": "Mae'r ystafell hon yn ystafell fideo",
         "waiting_for_join_subtitle": "Unwaith y bydd defnyddwyr sydd wedi'u gwahodd wedi ymuno â %(brand)s, byddwch yn gallu sgwrsio a bydd yr ystafell yn cael ei hamgryptio pen-i-ben",
         "waiting_for_join_title": "Yn aros i ddefnyddwyr ymuno â %(brand)s"
     },
@@ -1998,11 +2048,14 @@
             "no_chats_description_no_room_rights": "Dechreuwch trwy anfon neges at rywun",
             "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_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",
             "no_rooms": "Nid ydych mewn unrhyw ystafell eto",
             "no_rooms_description": "Gallwch ddad-ddewis hidlwyr er mwyn gweld eich sgyrsiau eraill",
             "no_unread": "Llongyfarchiadau! Nid oes gennych unrhyw negeseuon heb eu darllen",
+            "show_activity": "Gweld yr holl weithgarwch",
             "show_chats": "Dangos pob sgwrs"
         },
         "failed_add_tag": "Wedi methu ag ychwanegu tag %(tagName)s i'r ystafell",
@@ -2010,6 +2063,8 @@
         "failed_set_dm_tag": "Wedi methu gosod tag neges uniongyrchol",
         "filters": {
             "favourite": "Ffefrynnau",
+            "invites": "Gwahoddiadau",
+            "mentions": "Crybwylliadau",
             "people": "Pobl",
             "rooms": "Ystafelloedd",
             "unread": "Heb ei ddarllen"
@@ -2032,18 +2087,24 @@
             "more_options": "Rhagor o Ddewisiadau",
             "open_room": "Agor ystafell %(roomName)s"
         },
+        "room_options": "Dewisiadau Ystafelloedd",
         "show_less": "Dangos llai",
         "show_previews": "Dangos rhagolwg o negeseuon",
+        "sort": "Trefnu",
         "sort_by": "Trefnu yn ôl",
         "sort_by_activity": "Gweithgaredd",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Gweithgaredd",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Dangos ystafelloedd gyda negeseuon heb eu darllen yn gyntaf",
         "space_menu": {
             "home": "Cartref gofod",
             "space_settings": "Gosodiadau Gofod"
         },
         "space_menu_label": "Dewislen %(spaceName)s",
-        "sublist_options": "Rhestrwch dewisiadau",
+        "sublist_options": "Dewisiadau rhestr",
         "suggested_rooms_heading": "Awgrym o Ystafelloedd"
     },
     "room_settings": {
@@ -2207,7 +2268,7 @@
             "users_default": "Rôl rhagosodedig"
         },
         "security": {
-            "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 botiau a phontydd rhag gweithio'n gywir. <a>Dysgu rhagor am amgryptio.</a>",
+            "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.",
             "enable_encryption_public_room_confirm_description_2": "Er mwyn osgoi'r problemau hyn, crëwch <a>ystafell newydd wedi'i hamgryptio</a> ar gyfer y sgwrs rydych chi'n bwriadu ei chael.",
@@ -2308,6 +2369,10 @@
         "recent_changes_heading": "Newidiadau diweddar sydd heb eu derbyn eto",
         "title": "Nid yw'r gweinydd yn ymateb"
     },
+    "service_worker_error": {
+        "description": "Mae angen gweithiwr gwasanaeth ar %(brand)s i lwytho cyfryngau dilys o storfeydd cynnwys Matrix. Nid yw hyn yn cael ei gefnogi gan eich porwr felly efallai y byddwch yn profi bod cyfryngau'n methu â llwytho.",
+        "title": "Methwyd llwytho gweithiwr gwasanaeth"
+    },
     "seshat": {
         "error_initialising": "Nid oedd modd cychwyn chwilio negeseuon, gwiriwch <a>eich gosodiadau</a> am ragor o wybodaeth",
         "reset_button": "Ailosod storfa digwyddiad",
@@ -2342,10 +2407,10 @@
         "all_rooms_home_description": "Bydd pob ystafell rydych chi ynddi yn ymddangos yn y Cartref.",
         "always_show_message_timestamps": "Dangos stampiau amser neges bob amser",
         "appearance": {
-            "bundled_emoji_font": "Defnyddiwch ffont emoji wedi'i bwndelu",
+            "bundled_emoji_font": "Defnyddio ffont emoji wedi'i bwndelu",
             "compact_layout": "Dangos testun cryno a negeseuon",
             "compact_layout_description": "Rhaid dewis cynllun modern i ddefnyddio'r nodwedd hon.",
-            "custom_font": "Defnyddiwch ffont system",
+            "custom_font": "Defnyddio ffont y system",
             "custom_font_description": "Gosodwch enw ffont sydd wedi'i osod ar eich system a bydd %(brand)s yn ceisio ei ddefnyddio.",
             "custom_font_name": "Enw ffont y system",
             "custom_font_size": "Defnyddio maint cyfaddas",
@@ -2386,6 +2451,7 @@
                 "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_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.",
                 "details_title": "Manylion amgryptio",
                 "do_not_close_warning": "Peidiwch â chau'r ffenestr hon nes bod yr ailosod wedi'i orffen",
@@ -2400,6 +2466,8 @@
                 "session_key": "Allwedd sesiwn:",
                 "title": "Uwch"
             },
+            "confirm_key_storage_off": "Ydych chi'n siŵr eich bod chi eisiau cadw storfa allweddi wedi'i diffodd?",
+            "confirm_key_storage_off_description": "Os byddwch chi'n allgofnodi o'ch holl ddyfeisiau byddwch chi'n colli'ch hanes negeseuon a bydd angen i chi wirio'ch holl gysylltiadau presennol eto. <a>Dysgu mwy</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Dileu storfa allweddi",
                 "confirm": "Dileu storfa allweddi",
@@ -2485,6 +2553,7 @@
             "discovery_needs_terms_title": "Gadewch i bobl ddod o hyd i chi",
             "display_name": "Enw Dangos",
             "display_name_error": "Methu gosod enw dangos",
+            "email_adding_unsupported_by_hs": "Nid yw'r gweinydd cartref hwn yn cefnogi ychwanegu cyfeiriadau e-bost at eich cyfrif.",
             "email_address_in_use": "Mae'r cyfeiriad e-bost hwn eisoes yn cael ei ddefnyddio",
             "email_address_label": "Cyfeiriad e-bost",
             "email_not_verified": "Nid yw eich cyfeiriad e-bost wedi'i wirio eto",
@@ -2509,7 +2578,9 @@
             "error_share_msisdn_discovery": "Methu rhannu rhif ffôn",
             "identity_server_no_token": "Heb ganfod docyn mynediad adnabod",
             "identity_server_not_set": "Heb osod gweinydd hunaniaeth",
+            "invalid_phone_number": "Nid yw'n ymddangos bod y rhif ffôn a ddarparwyd yn ddilys.",
             "language_section": "Iaith",
+            "msisdn_adding_unsupported_by_hs": "Nid yw'r gweinydd cartref hwn yn cefnogi ychwanegu rhifau ffôn at eich cyfrif.",
             "msisdn_in_use": "Mae'r rhif ffôn hwn eisoes yn cael ei ddefnyddio",
             "msisdn_label": "Rhif Ffôn",
             "msisdn_verification_field_label": "Cod dilysu",
@@ -2528,13 +2599,11 @@
             "unable_to_load_msisdns": "Methu llwytho rhifau ffôn",
             "username": "Enw defnyddiwr"
         },
-        "image_thumbnails": "Dangos rhagolygon / lluniau bach ar gyfer delweddau",
         "inline_url_previews_default": "Galluogi rhagolygon URL mewnol fel rhagosodiad",
         "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_avatars": "Dangos afatarau ystafelloedd y cawsoch eich gwahodd iddynn nhw",
-        "jump_to_bottom_on_send": "Neidio i waelod y llinell amser pan fyddwch chi'n anfon neges",
+        "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…",
@@ -2592,6 +2661,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Gosodiadau:</strong> Defnyddwyr wedi'u Hanwybyddu"
         },
+        "media_preview": {
+            "hide_avatars": "Cuddio afatarau o'r ystafell a'r gwahoddwr",
+            "hide_media": "Cuddio bob tro",
+            "media_preview_description": "Mae modd dangos cyfrwng cudd trwy dapio arno",
+            "media_preview_label": "Dangos cyfryngau mewn llinell amser",
+            "show_in_private": "Mewn ystafelloedd preifat",
+            "show_media": "Dangos bob tro"
+        },
         "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)",
@@ -2621,7 +2698,7 @@
             "mentions_keywords_only": "Crybwyll ac Allweddeiriau yn unig",
             "messages_containing_keywords": "Negeseuon yn cynnwys allweddeiriau",
             "noisy": "Swnllyd",
-            "notices": "Negeseuon a anfonwyd gan bots",
+            "notices": "Negeseuon a anfonwyd gan fotiau",
             "notify_at_room": "Rhowch wybod pan fydd rhywun yn sôn am ddefnyddio @room",
             "notify_keyword": "Rhowch wybod pan fydd rhywun yn defnyddio allweddair",
             "notify_mention": "Rhoi gwybod pan fydd rhywun yn sôn am ddefnyddio @displaymatere neu %(mxid)s",
@@ -2639,7 +2716,7 @@
             "rule_contains_user_name": "Negeseuon yn cynnwys fy enw defnyddiwr",
             "rule_encrypted": "Negeseuon wedi'u hamgryptio mewn sgyrsiau grŵp",
             "rule_encrypted_room_one_to_one": "Negeseuon wedi'u hamgryptio mewn sgyrsiau un-i-un",
-            "rule_invite_for_me": "Pan fyddaf yn cael fy ngwahodd i ystafell",
+            "rule_invite_for_me": "Pan yn cael fy ngwahodd i ystafell",
             "rule_message": "Negeseuon mewn sgyrsiau grŵp",
             "rule_room_one_to_one": "Negeseuon mewn sgyrsiau un-i-un",
             "rule_roomnotif": "Negeseuon yn cynnwys @room",
@@ -2653,7 +2730,7 @@
             "always_show_menu_bar": "Dangos far dewislen y ffenestr bob amser",
             "autocomplete_delay": "Oedi awtogwblhau (ms)",
             "code_blocks_heading": "Blociau cod",
-            "compact_modern": "Defnyddiwch gynllun 'Modern' mwy cryno",
+            "compact_modern": "Defnyddio cynllun 'Modern' mwy cryno",
             "composer_heading": "Cyfansoddwr",
             "default_timezone": "Porwr rhagosodedig (%(timezone)s)",
             "dialog_title": "<strong>Gosodiadau:</strong> Dewisiadau",
@@ -2662,7 +2739,7 @@
             "keyboard_heading": "Bysellau brys",
             "keyboard_view_shortcuts_button": "I weld yr holl lwybrau byr bysellfwrdd, <a>cliciwch yma</a>.",
             "media_heading": "Delweddau, GIFs a fideos",
-            "presence_description": "Rhannwch eich gweithgarwch a'ch statws ag eraill.",
+            "presence_description": "Rhannu'ch gweithgarwch a'ch statws ag eraill.",
             "publish_timezone": "Cyhoeddi cylchfa amser ar broffil cyhoeddus",
             "rm_lifetime": "Darllen oes Marciwr (ms)",
             "rm_lifetime_offscreen": "Darllen Marciwr oes oddi ar y sgrin (ms)",
@@ -2677,59 +2754,22 @@
         "prompt_invite": "Annog cyn anfon gwahoddiadau i IDau matrics a allai fod yn annilys",
         "replace_plain_emoji": "Amnewid Emoji testun plaen yn awtomatig",
         "security": {
-            "4s_public_key_in_account_data": "mewn data cyfrif",
-            "4s_public_key_status": "Allwedd gyhoeddus storio gyfrinachol:",
             "analytics_description": "Rhanwch ddata dienw i'n helpu i nodi problemau. Dim byd personol. Dim trydydd partïon.",
-            "backup_key_cached_status": "Allwedd wrth gefn wedi'i storio:",
-            "backup_key_stored_status": "Allwedd wrth gefn wedi'i storio:",
-            "backup_key_unexpected_type": "math annisgwyl",
-            "backup_key_well_formed": "wedi'i ffurfio'n dda",
-            "backup_keys_description": "Gwnewch gopi wrth gefn o'ch allweddi amgryptio gyda'ch data cyfrif rhag ofn i chi golli mynediad i'ch sesiynau. Bydd eich allweddi yn cael eu diogelu gydag Allwedd Adfer unigryw.",
             "bulk_options_accept_all_invites": "Derbyn pob %(invitedRooms)s gwahoddiad",
             "bulk_options_reject_all_invites": "Gwrthod pob %(invitedRooms)s gwahoddiad",
             "bulk_options_section": "Dewisiadau lluosog",
-            "cross_signing_cached": "wedi'i storio'n lleol",
-            "cross_signing_homeserver_support": "Cefnogaeth nodwedd Homeserver:",
-            "cross_signing_homeserver_support_exists": "yn bodoli",
-            "cross_signing_in_4s": "mewn storfa gyfrinachol",
-            "cross_signing_in_memory": "yn y cof",
-            "cross_signing_master_private_Key": "Prif allwedd breifat:",
-            "cross_signing_not_cached": "heb ei ganfod yn lleol",
-            "cross_signing_not_found": "heb ei ganfod",
-            "cross_signing_not_in_4s": "heb ei ganfod yn y storfa",
-            "cross_signing_not_stored": "heb ei storio",
-            "cross_signing_private_keys": "Traws-lofnodi allweddi preifat:",
-            "cross_signing_public_keys": "Traws-lofnodi allweddi cyhoeddus:",
-            "cross_signing_self_signing_private_key": "Allwedd breifat hunan-arwyddo:",
-            "cross_signing_user_signing_private_key": "Defnyddiwr yn arwyddo allwedd breifat:",
-            "cryptography_section": "Cryptograffi",
             "dehydrated_device_description": "Mae'r nodwedd dyfais all-lein yn caniatáu ichi dderbyn negeseuon wedi'u hamgryptio hyd yn oed pan nad ydych wedi mewngofnodi i unrhyw ddyfeisiau",
             "dehydrated_device_enabled": "Dyfais all-lein wedi'i galluogi",
-            "delete_backup": "Dileu copi wrth gefn",
-            "delete_backup_confirm_description": "Ydych chi'n siŵr? Byddwch yn colli'ch negeseuon wedi'u hamgryptio os na fydd copïau wrth gefn o'ch allweddi yn gywir.",
             "dialog_title": "<strong>Gosodiadau:</strong> Diogelwch a Phreifatrwydd",
             "e2ee_default_disabled_warning": "Mae gweinyddwr eich gweinydd wedi analluogi amgryptio pen-i-ddiwedd fel rhagosodiad mewn ystafelloedd preifat a Negeseuon Uniongyrchol.",
             "enable_message_search": "Galluogi chwiliad negeseuon mewn ystafelloedd wedi'u hamgryptio",
             "encryption_section": "Amgryptio",
-            "error_loading_key_backup_status": "Methu llwytho statws wrth gefn allwedd",
-            "export_megolm_keys": "Allforio allweddi ystafell E2E",
             "ignore_users_empty": "Nid oes gennych unrhyw ddefnyddwyr sydd wedi'u hanwybyddu.",
             "ignore_users_section": "Defnyddwyr wedi'u hanwybyddu",
-            "import_megolm_keys": "Mewnforio allweddi ystafell E2E",
-            "key_backup_active": "Mae'r sesiwn hon yn gwneud copi wrth gefn o'ch allweddi.",
-            "key_backup_active_version": "Fersiwn wrth gefn gweithredol:",
-            "key_backup_active_version_none": "Dim",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_can_be_restored": "Mae modd adfer y copi wrth gefn hwn yn y sesiwn hon",
-            "key_backup_complete": "Pob allwedd wrth gefn",
             "key_backup_connect": "Cysylltwch y sesiwn hon i Bysell Wrth Gefn",
-            "key_backup_connect_prompt": "Cysylltwch y sesiwn hon â chopi wrth gefn cyn allgofnodi er mwyn osgoi colli unrhyw allweddi a allai fod ar y sesiwn hon yn unig.",
-            "key_backup_in_progress": "Wrthi'n gwneud copïau wrth gefn o %(sessionsRemaining)s allwedd…",
-            "key_backup_inactive": "<b>Nid yw'r sesiwn hon yn gwneud copi wrth gefn o'ch allweddi</b>, ond mae gennych chi gopi wrth gefn yn barod y gallwch chi adfer ohono ac ychwanegu ato wrth symud ymlaen.",
-            "key_backup_inactive_warning": "<b>Nid yw eich allweddi yn cael eu gwneud copi wrth gefn o'r sesiwn hon</b>.",
-            "key_backup_latest_version": "Fersiwn wrth gefn diweddaraf ar y gweinydd:",
             "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 iddynt 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_failed": "Methwyd cychwyn chwiliad neges",
             "message_search_indexed_messages": "Negeseuon wedi'u mynegeio:",
             "message_search_indexed_rooms": "Ystafelloedd wedi'u mynegeio:",
@@ -2737,19 +2777,13 @@
             "message_search_indexing_idle": "Ddim yn mynegeio negeseuon ar gyfer unrhyw ystafell ar hyn o bryd.",
             "message_search_intro": "Mae %(brand)s yn cadw negeseuon wedi'u hamgryptio'n ddiogel yn lleol er mwyn iddynt ymddangos yn y canlyniadau chwilio:",
             "message_search_room_progress": "%(doneRooms)s allan o %(totalRooms)s",
-            "message_search_section": "Chwilio neges",
+            "message_search_section": "Chwilio am neges",
             "message_search_sleep_time": "Pa mor gyflym dylai negeseuon gael eu llwytho i lawr.",
             "message_search_space_used": "Gofod wedi'i ddefnyddio:",
             "message_search_unsupported": "Mae %(brand)s ar goll o rai cydrannau sydd eu hangen i gadw negeseuon wedi'u hamgryptio'n ddiogel yn lleol. Os hoffech arbrofi gyda'r nodwedd hon, adeiladwch Bwrdd Gwaith %(brand)s wedi'i deilwra ag ef<nativeLink> cydrannau chwilio wedi'u hychwanegu</nativeLink>.",
             "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",
-            "restore_key_backup": "Adfer o'r Copi Wrth Gefn",
-            "secret_storage_not_ready": "ddim yn barod",
-            "secret_storage_ready": "yn barod",
-            "secret_storage_status": "Storio cyfrinachol:",
             "send_analytics": "Anfon data dadansoddeg",
-            "session_id": "ID y sesiwn:",
-            "session_key": "Allwedd sesiwn:",
             "strict_encryption": "Peidio byth anfon negeseuon wedi'u hamgryptio i sesiynau heb eu gwirio o'r sesiwn hon"
         },
         "send_read_receipts": "Anfon derbynebau darllen",
@@ -2758,7 +2792,7 @@
         "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",
-            "current_session": "Sesiwn gyfredol",
+            "current_session": "Y sesiwn gyfredol",
             "desktop_session": "Sesiwn bwrdd gwaith",
             "details_heading": "Manylion y sesiwn",
             "device_unverified_description": "Dilyswch neu allgofnodwch o'r sesiwn hon er mwyn sicrhau'r diogelwch a'r dibynadwyedd gorau.",
@@ -2770,12 +2804,12 @@
             "error_set_name": "Wedi methu gosod enw'r sesiwn",
             "filter_all": "Y Cyfan",
             "filter_inactive": "Anweithredol",
-            "filter_inactive_description": "Anweithredol am %(inactiveAgeDays)s diwrnod neu fwy",
+            "filter_inactive_description": "Anweithredol ers %(inactiveAgeDays)s diwrnod neu fwy",
             "filter_label": "Hidlo dyfeisiau",
             "filter_unverified_description": "Ddim yn barod ar gyfer negeseuon diogel",
             "filter_verified_description": "Yn barod ar gyfer negeseuon diogel",
             "hide_details": "Cuddio manylion",
-            "inactive_days": "Anweithredol am %(inactiveAgeDays)s+ diwrnod",
+            "inactive_days": "Anweithredol ers %(inactiveAgeDays)s+ diwrnod",
             "inactive_sessions": "Sesiynau anweithredol",
             "inactive_sessions_explainer_1": "Mae sesiynau anweithredol yn sesiynau nad ydych wedi'u defnyddio ers peth amser, ond maent yn parhau i dderbyn allweddi amgryptio.",
             "inactive_sessions_explainer_2": "Mae cael gwared ar sesiynau anweithredol yn gwella diogelwch a pherfformiad, ac yn ei gwneud yn haws i chi nodi a yw sesiwn newydd yn amheus.",
@@ -2804,7 +2838,7 @@
             "show_details": "Dangos manylion",
             "sign_in_with_qr": "Cysylltu'r ddyfais newydd",
             "sign_in_with_qr_button": "Dangos cod QR",
-            "sign_in_with_qr_description": "Defnyddiwch god QR i fewngofnodi i ddyfais arall a gosod negeseuon diogel.",
+            "sign_in_with_qr_description": "Defnyddio cod QR i fewngofnodi i ddyfais arall a gosod negeseuon diogel.",
             "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)",
@@ -2854,8 +2888,8 @@
             "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": "Dechreuwch yn awtomatig ar ôl mewngofnodi i'r system",
-        "tac_only_notifications": "Dim ond yng nghanolfan gweithgaredd yr edefyn y dangoswch hysbysiadau",
+        "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",
         "use_command_f_search": "Defnyddiwch Command + F i chwilio llinell amser",
@@ -2884,7 +2918,7 @@
             "voice_processing": "Prosesu llais",
             "voice_section": "Gosodiadau llais"
         },
-        "warn_quit": "Rhybuddiwch cyn rhoi'r gorau iddi",
+        "warn_quit": "Rhybuddio cyn rhoi'r gorau iddi",
         "warning": "<w>RHYBUDD:</w><description/>"
     },
     "share": {
@@ -2935,7 +2969,7 @@
         "invite_3pid_use_default_is_title_description": "Defnyddiwch weinydd hunaniaeth i wahodd trwy e-bost. Cliciwch parhau i ddefnyddio'r gweinydd hunaniaeth drhagosodedig (%(defaultIdentityServerName)s) neu rheoli yn y Gosodiadau.",
         "invite_failed": "Nid oedd defnyddiwr (%(user)s) wedi'i wahodd i %(roomId)s yn y pen draw ond ni roddwyd gwall o gyfleustodau'r gwahoddwr",
         "join": "Yn ymuno â'r ystafell gyda chyfeiriad a roddwyd",
-        "jumptodate": "Neidio i'r dyddiad a roddwyd yn y llinell amser",
+        "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",
         "me": "Yn dangos gweithredu",
@@ -2964,8 +2998,6 @@
         "topic": "Yn cael neu'n gosod pwnc yr ystafell",
         "topic_none": "Nid oes gan yr ystafell hon unrhyw bwnc.",
         "topic_room_error": "Wedi methu â chael pwnc ystafell: Methu dod o hyd i ystafell (%(roomId)s",
-        "tovirtual": "Yn newid i ystafell rithwir yr ystafell hon, os oes ganddi un",
-        "tovirtual_not_found": "Dim ystafell rithwir ar gyfer yr ystafell hon",
         "unban": "Yn dad-wahardd defnyddiwr gydag ID penodol",
         "unflip": "Yn rhagflaenu ┬──┬ ノ(゜-゜ノ) i neges testun plaen",
         "unholdcall": "Yn cymryd yr alwad yn yr ystafell bresennol oddi ar y stop",
@@ -3014,7 +3046,7 @@
         "invite_description": "Gwahodd gydag e-bost neu enw defnyddiwr",
         "invite_link": "Rhannu dolen gwahoddiad",
         "joining_space": "Yn ymuno",
-        "landing_welcome": "Croeso i<matere/>",
+        "landing_welcome": "Croeso i <name/>",
         "leave_dialog_action": "Gadael lle",
         "leave_dialog_description": "Rydych chi ar fin gadael<spaceName/>.",
         "leave_dialog_only_admin_room_warning": "Chi yw unig weinyddwr rhai o'r ystafelloedd neu'r gofodau yr hoffech eu gadael. Bydd eu gadael yn eu gadael heb unrhyw weinyddwyr.",
@@ -3080,7 +3112,7 @@
         "heading_without_query": "Chwilio am",
         "join_button_text": "Ymuno â %(roomAddress)s",
         "keyboard_scroll_hint": "Defnydd<arrows/> i sgrolio",
-        "message_search_section_title": "Chwiliadau eraill",
+        "messages_label": "Negeseuon",
         "other_rooms_in_space": "Ystafelloedd eraill yn %(spaceName)s",
         "public_rooms_label": "Ystafelloedd cyhoeddus",
         "public_spaces_label": "Gofodau cyhoeddus",
@@ -3090,7 +3122,6 @@
         "result_may_be_hidden_privacy_warning": "Gall rhai canlyniadau gael eu cuddio er preifatrwydd",
         "result_may_be_hidden_warning": "Efallai y bydd rhai canlyniadau wedi'u cuddio",
         "search_dialog": "Deialog Chwilio",
-        "search_messages_hint": "I chwilio negeseuon, edrychwch am yr eicon hwn ar frig ystafell<icon/>",
         "spaces_title": "Gofodau rydych chi ynddyn nhw",
         "start_group_chat_button": "Dechreuwch sgwrs grŵp"
     },
@@ -3121,23 +3152,21 @@
     },
     "thread_view_back_action_label": "Yn ôl i'r edefyn",
     "threads": {
-        "all_threads": "Pob edafedd",
-        "all_threads_description": "Yn dangos pob trywydd o'r ystafell gyfredol",
+        "all_threads": "Pob edefyn",
+        "all_threads_description": "Yn dangos pob edefyn o'r ystafell gyfredol",
         "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",
         "mark_all_read": "Marcio'r cyfan wedi'u darllen",
         "my_threads": "Fy edafedd",
-        "my_threads_description": "Yn dangos pob trywydd rydych chi wedi cymryd rhan ynddo",
-        "open_thread": "Edau agored",
+        "my_threads_description": "Yn dangos pob edefyn rydych chi wedi cymryd rhan ynddo",
+        "open_thread": "Edafedd agored",
         "show_thread_filter": "Dangos:"
     },
     "threads_activity_centre": {
         "header": "Gweithgaredd edafedd",
-        "no_rooms_with_threads_notifs": "Nid oes gennych chi ystafelloedd gyda hysbysiadau trywydd eto.",
-        "no_rooms_with_unread_threads": "Nid oes gennych chi ystafelloedd ag edafedd heb eu darllen eto.",
-        "release_announcement_description": "Mae hysbysiadau edafedd wedi symud, dewch o hyd iddynt yma o hyn ymlaen.",
-        "release_announcement_header": "Canolfan Gweithgareddau Threads"
+        "no_rooms_with_threads_notifs": "Nid oes gennych chi ystafelloedd gyda hysbysiadau edafedd eto.",
+        "no_rooms_with_unread_threads": "Nid oes gennych chi ystafelloedd ag edafedd heb eu darllen eto."
     },
     "time": {
         "about_day_ago": "tua diwrnod yn ôl",
@@ -3449,10 +3478,106 @@
         "send_state_sending": "Wrthi'n anfon eich neges…",
         "send_state_sent": "Anfonwyd eich neges",
         "summary": {
-            "format": "%(matereList)s %(transitionList)s"
+            "format": "%(matereList)s %(transitionList)s",
+            "invite_withdrawn_multiple": {
+                "zero": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu",
+                "one": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu",
+                "two": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu %(count)s gwaith",
+                "few": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu %(count)s gwaith",
+                "many": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu %(count)s gwaith",
+                "other": "Cafodd %(severalUsers)s eu gwahoddiadau eu dileu %(count)s gwaith"
+            },
+            "joined": {
+                "zero": "Ymunodd %(oneUser)s %(count)s gwaith",
+                "one": "Ymunodd %(oneUser)s",
+                "two": "Ymunodd %(oneUser)s %(count)s gwaith",
+                "few": "Ymunodd %(oneUser)s %(count)s gwaith",
+                "many": "Ymunodd %(oneUser)s %(count)s gwaith",
+                "other": "Ymunodd %(oneUser)s %(count)s gwaith"
+            },
+            "joined_and_left": {
+                "zero": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "one": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "two": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "few": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "many": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "other": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith"
+            },
+            "joined_and_left_multiple": {
+                "zero": "Ymunodd a gadawodd %(severalUsers)s",
+                "one": "Ymunodd a gadawodd %(severalUsers)s",
+                "two": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "few": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "many": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "other": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith"
+            },
+            "joined_multiple": {
+                "zero": "Ymunodd %(severalUsers)s",
+                "one": "Ymunodd %(severalUsers)s %(count)s gwaith",
+                "two": "Ymunodd %(severalUsers)s %(count)s gwaith",
+                "few": "Ymunodd %(severalUsers)s %(count)s gwaith",
+                "many": "Ymunodd %(severalUsers)s %(count)s gwaith",
+                "other": "Ymunodd %(severalUsers)s %(count)s gwaith"
+            },
+            "left": {
+                "zero": "Gadawodd %(oneUser)s",
+                "one": "Gadawodd %(oneUser)s",
+                "two": "Gadawodd %(oneUser)s %(count)s gwaith",
+                "few": "Gadawodd %(oneUser)s %(count)s gwaith",
+                "many": "Gadawodd %(oneUser)s %(count)s gwaith",
+                "other": "Gadawodd %(oneUser)s %(count)s gwaith"
+            },
+            "left_multiple": {
+                "zero": "Gadawodd %(severalUsers)s",
+                "one": "Gadawodd %(severalUsers)s",
+                "two": "Gadawodd %(severalUsers)s %(count)s gwaith",
+                "few": "Gadawodd %(severalUsers)s %(count)s gwaith",
+                "many": "Gadawodd %(severalUsers)s %(count)s gwaith",
+                "other": "Gadawodd %(severalUsers)s %(count)s gwaith"
+            },
+            "rejected_invite": {
+                "zero": "Gwrthododd %(severalUsers)s eu gwahoddiadau",
+                "one": "Gwrthododd %(oneUser)s ei wahoddiad",
+                "two": "Gwrthododd %(oneUser)s eu gwahoddiadau %(count)s gwaith",
+                "few": "Gwrthododd %(oneUser)s eu gwahoddiadau %(count)s gwaith",
+                "many": "Gwrthododd %(oneUser)s eu gwahoddiadau %(count)s gwaith",
+                "other": "Gwrthododd %(oneUser)s eu gwahoddiadau %(count)s gwaith"
+            },
+            "rejected_invite_multiple": {
+                "zero": "Gwrthododd %(severalUsers)s eu gwahoddiadau",
+                "one": "Gwrthododd %(severalUsers)s eu gwahoddiadau",
+                "two": "Gwrthododd %(severalUsers)s eu gwahoddiadau %(count)s gwaith",
+                "few": "Gwrthododd %(severalUsers)s eu gwahoddiadau %(count)s gwaith",
+                "many": "Gwrthododd %(severalUsers)s eu gwahoddiadau %(count)s gwaith",
+                "other": "Gwrthododd %(severalUsers)s eu gwahoddiadau %(count)s gwaith"
+            },
+            "rejoined": {
+                "zero": "Ymunodd a gadawodd %(oneUser)s",
+                "one": "Ymunodd a gadawodd %(oneUser)s",
+                "two": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "few": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "many": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith",
+                "other": "Ymunodd a gadawodd %(oneUser)s %(count)s gwaith"
+            },
+            "rejoined_multiple": {
+                "zero": "Ymunodd a gadawodd %(severalUsers)s",
+                "one": "Ymunodd a gadawodd %(severalUsers)s",
+                "two": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "few": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "many": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith",
+                "other": "Ymunodd a gadawodd %(severalUsers)s %(count)s gwaith"
+            }
         },
         "thread_info_basic": "O edefyn",
         "typing_indicator": {
+            "more_users": {
+                "zero": "Mae %(names)s ac mae %(count)s eraill yn teipio...",
+                "one": "Mae %(names)s ac mae un arall yn teipio...",
+                "two": "Mae %(names)s ac mae %(count)s eraill yn teipio...",
+                "few": "Mae %(names)s ac mae %(count)s eraill yn teipio...",
+                "many": "Mae %(names)s ac mae %(count)s eraill yn teipio...",
+                "other": "Mae %(names)s ac mae %(count)s eraill yn teipio..."
+            },
             "one_user": "Mae %(displayName)s yn teipio…",
             "two_users": "Mae %(materes)s a %(lastPerson)s yn teipio…"
         },
@@ -3486,6 +3611,7 @@
         "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.",
         "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"
     },
     "upload_failed_generic": "Methodd y ffeil '%(fileName)s' â llwytho i fyny.",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 34b27ef1e2..e55b50ce88 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -12,7 +12,7 @@
             "one": "1 ungelesene Erwähnung."
         },
         "recent_rooms": "Kürzlich besuchte Chatrooms",
-        "room_messsage_not_sent": "Öffnen Sie den %(roomName)s Raum mit einer nicht gesetzten Nachricht.",
+        "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.",
         "room_n_unread_messages": {
             "one": "Raum %(roomName)s öffnen mit 1 ungelesenen Nachricht.",
@@ -55,6 +55,8 @@
         "create_a_room": "Raum erstellen",
         "create_account": "Konto erstellen",
         "decline": "Ablehnen",
+        "decline_and_block": "Ablehnen und blockieren",
+        "decline_invite": "Einladung ablehnen",
         "delete": "Löschen",
         "deny": "Ablehnen",
         "disable": "Deaktivieren",
@@ -107,7 +109,6 @@
         "react": "Reagieren",
         "refresh": "Neu laden",
         "register": "Registrieren",
-        "reject": "Ablehnen",
         "reload": "Neu laden",
         "remove": "Entfernen",
         "rename": "Umbenennen",
@@ -156,6 +157,7 @@
         "view_message": "Nachricht anzeigen",
         "view_source": "Rohdaten anzeigen",
         "yes": "Ja",
+        "yes_dismiss": "Ja, verwerfen",
         "zoom_in": "Vergrößern",
         "zoom_out": "Verkleinern"
     },
@@ -385,6 +387,7 @@
             "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",
             "msisdn": "Eine Textnachricht wurde an %(msisdn)s gesendet",
             "msisdn_token_incorrect": "Token fehlerhaft",
             "msisdn_token_prompt": "Bitte gib den darin enthaltenen Code ein:",
@@ -486,7 +489,6 @@
         "capabilities": "Funktionen",
         "copied": "Kopiert!",
         "credits": "Danksagungen",
-        "cross_signing": "Quersignierung",
         "dark": "Dunkel",
         "description": "Beschreibung",
         "deselect_all": "Alle abwählen",
@@ -525,6 +527,7 @@
         "message_timestamp_invalid": "Ungültiger Zeitstempel",
         "microphone": "Mikrofon",
         "model": "Modell",
+        "moderation_and_safety": "Moderation und Sicherheit",
         "modern": "Modern",
         "mute": "Stummschalten",
         "n_members": {
@@ -746,6 +749,13 @@
         "twemoji": "Die <twemoji>Twemoji</twemoji>-Emojis sind © <author>Twitter, Inc und weitere Mitwirkende</author> und wird unter den Bedingungen von <terms>CC-BY 4.0</terms> verwendet.",
         "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.",
+        "title": "Einladung ablehnen"
+    },
     "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktive Widgets",
@@ -774,7 +784,7 @@
             "cross_signing_public_keys_on_device_status": "Überkreuzsignierung öffentlicher Schlüssel:",
             "cross_signing_ready": "Kreuzsignatur ist einsatzbereit.",
             "cross_signing_status": "Status der Kreuzsignatur",
-            "cross_signing_untrusted": "Ihr Konto verfügt über eine Cross-Signing-Identität im geheimen Speicher, diese wird von dieser Sitzung jedoch noch nicht als vertrauenswürdig eingestuft.",
+            "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",
             "key_backup_active_version": "Aktive Backup Version:",
             "key_backup_active_version_none": "Keine",
@@ -846,6 +856,9 @@
         "setting_colon": "Einstellung:",
         "setting_definition": "Definition der Einstellung:",
         "setting_id": "Einstellungs-ID",
+        "settings": {
+            "elementCallUrl": "Element Call URL"
+        },
         "settings_explorer": "Einstellungsübersicht",
         "show_hidden_events": "Versteckte Ereignisse im Verlauf anzeigen",
         "spaces": {
@@ -898,44 +911,25 @@
     "empty_room_was_name": "Leerer Raum (war %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Um fortzufahren, geben Sie Ihre Sicherheitsphrase ein oder <button> verwenden Sie Ihren Wiederherstellungsschlüssel</button>, um fortzufahren.",
+            "alternatives": "Wenn Sie einen Sicherheitsschlüssel oder eine Sicherheitsphrase haben, funktioniert das auch.",
             "key_validation_text": {
-                "invalid_security_key": "Ungültiger Wiederherstellungsschlüssel",
-                "recovery_key_is_correct": "Sieht gut aus!",
-                "wrong_file_type": "Falscher Dateityp",
-                "wrong_security_key": "Falscher Wiederherstellungsschlüssel"
+                "wrong_security_key": "Der eingegebene Wiederherstellungsschlüssel ist nicht korrekt."
             },
-            "reset_title": "Alles zurücksetzen",
-            "reset_warning_1": "Verwende es nur, wenn du kein Gerät, mit dem du dich verifizieren kannst, bei dir hast.",
-            "reset_warning_2": "Wenn du alles zurücksetzt, beginnst du ohne verifizierte Sitzungen und Benutzende von Neuem und siehst eventuell keine alten Nachrichten.",
+            "privacy_warning": "Stellen Sie sicher, dass niemand diesen Bildschirm sehen kann!",
             "restoring": "Schlüssel aus der Sicherung wiederherstellen",
-            "security_key_title": "Wiederherstellungsschlüssel",
-            "security_phrase_incorrect_error": "Zugriff auf sicheren Speicher nicht möglich. Bitte überprüfe, ob du die richtige Sicherheitsphrase eingegeben hast.",
-            "security_phrase_title": "Sicherheitsphrase",
-            "separator": "%(securityKey)s oder %(recoveryFile)s",
-            "use_security_key_prompt": "Verwenden Sie Ihren Wiederherstellungsschlüssel, um fortzufahren."
+            "security_key_title": "Wiederherstellungsschlüssel"
         },
         "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_not_ready": "Quersignierung wurde nicht eingerichtet.",
-        "cross_signing_ready": "Quersignaturen sind bereits in Anwendung.",
-        "cross_signing_ready_no_backup": "Quersignatur ist bereit, die Schlüssel sind aber nicht gesichert.",
         "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_warning": "Jemand verwendet eine unbekannte Sitzung",
-        "cross_signing_unsupported": "Dein Heim-Server unterstützt keine Quersignierung.",
-        "cross_signing_untrusted": "Dein Konto hat eine Quersignaturidentität im sicheren Speicher, der von dieser Sitzung jedoch noch nicht vertraut wird.",
         "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.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Cross-Signing-Schlüssel löschen",
-            "title": "Cross-Signing-Schlüssel zerstören?",
-            "warning": "Das Löschen von Quersignierungsschlüsseln ist dauerhaft. Alle, mit dem du dich verifiziert hast, werden Sicherheitswarnungen angezeigt bekommen. Du möchtest dies mit ziemlicher Sicherheit nicht tun, es sei denn, du hast jedes Gerät verloren, von dem aus du quersignieren kannst."
-        },
         "enter_recovery_key": "Geben Sie 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_key": "Von einer nicht verifizierten Sitzung verschlüsselt",
@@ -962,7 +956,6 @@
             "title": "Neue Wiederherstellungsmethode",
             "warning": "Wenn du die neue Wiederherstellungsmethode nicht festgelegt hast, versucht ein Angreifer möglicherweise, auf dein Konto zuzugreifen. Ändere dein Kontopasswort und lege sofort eine neue Wiederherstellungsmethode in den Einstellungen fest."
         },
-        "not_supported": "<nicht unterstützt>",
         "pinned_identity_changed": "%(displayName)s's (<b>%(userId)s</b>) Identität wurde zurückgesetzt. <a>Mehr erfahren </a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>Die Identität wurde zurückgesetzt. <a>Erfahre mehr </a>",
         "recovery_method_removed": {
@@ -978,9 +971,10 @@
         "set_up_toast_description": "Schütze dich vor dem Verlust verschlüsselter Nachrichten und Daten",
         "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.",
-            "title": "Einrichten"
+            "explainer": "Um deine Schlüssel nicht zu verlieren, musst du sie vor der Abmeldung sichern."
         },
+        "turn_on_key_storage": "Schlüsselspeicher einschalten",
+        "turn_on_key_storage_description": "Die kryptografische Identität und die Schlüssel deiner Nachrichten sicher auf dem Server speichern. So kann der Nachrichtenverlauf auf allen neuen Geräten angezeigt werden.",
         "udd": {
             "interactive_verification_button": "Interaktiv per Emoji verifizieren",
             "other_ask_verify_text": "Bitte diesen Nutzer, seine Sitzung zu verifizieren, oder verifiziere diese unten manuell.",
@@ -994,7 +988,6 @@
             "accepting": "Annehmen…",
             "after_new_login": {
                 "device_verified": "Gerät verifiziert",
-                "reset_confirmation": "Willst du deine Verifizierungsschlüssel wirklich zurücksetzen?",
                 "skip_verification": "Verifizierung vorläufig überspringen",
                 "unable_to_verify": "Gerät konnte nicht verifiziert werden",
                 "verify_this_device": "Dieses Gerät verifizieren"
@@ -1065,8 +1058,6 @@
             "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_reset_warning_1": "Das Zurücksetzen deiner Sicherheitsschlüssel kann nicht rückgängig gemacht werden. Nach dem Zurücksetzen wirst du alte Nachrichten nicht mehr lesen können und Freunde, die dich vorher verifiziert haben werden Sicherheitswarnungen bekommen, bis du dich erneut mit ihnen verifizierst.",
-            "verify_reset_warning_2": "Bitte fahren Sie nur fort, wenn Sie sicher sind, dass Sie Ihren Zugang zu allen anderen Geräte und Ihren Wiederherstellungsschlüssel verloren haben.",
             "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",
@@ -1135,11 +1126,7 @@
             "title": "Raumlink konnte nicht kopiert werden"
         },
         "error_loading_user_profile": "Konnte Nutzerprofil nicht laden",
-        "forget_room_failed": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
-            "title": "Suche ist fehlgeschlagen"
-        }
+        "forget_room_failed": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s"
     },
     "error_user_not_logged_in": "Benutzer ist nicht angemeldet",
     "event_preview": {
@@ -1674,6 +1661,7 @@
         "class_global": "Global",
         "class_other": "Sonstiges",
         "default": "Standard",
+        "default_settings": "Standardeinstellungen verwenden",
         "email_pusher_app_display_name": "E-Mail-Benachrichtigungen",
         "enable_prompt_toast_description": "Aktiviere Desktopbenachrichtigungen",
         "enable_prompt_toast_title": "Benachrichtigungen",
@@ -1692,7 +1680,8 @@
         "mentions_and_keywords_description": "Nur bei Erwähnungen und Schlüsselwörtern benachrichtigen, die du in den <a>Einstellungen</a> konfigurieren kannst",
         "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_description": "Du wirst keine Benachrichtigungen erhalten",
+        "mute_room": "Raum stummschalten"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s fordert eine Verifizierung an"
@@ -1794,11 +1783,6 @@
         "ongoing": "Löschen…",
         "reason_label": "Grund (optional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Bist du sicher, dass du die Einladung ablehnen willst?",
-        "failed": "Einladung konnte nicht abgelehnt werden",
-        "title": "Einladung ablehnen"
-    },
     "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.",
         "disagree": "Ablehnen",
@@ -1822,10 +1806,8 @@
         "toxic_behaviour": "Toxisches Verhalten"
     },
     "report_room": {
-        "description": "Melden Sie diesen Raum Ihrem Homeserver-Administrator. Dadurch wird die eindeutige ID des Raums gesendet. Wenn Nachrichten verschlüsselt sind, kann der Administrator sie jedoch nicht lesen oder geteilte Dateien anzeigen.",
-        "reason_placeholder": " Grund für die Meldung...",
-        "sent": "Ihr Bericht wurde gesendet.",
-        "title": "Raum melden"
+        "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"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Konnte %(failedCount)s Sitzungen nicht entschlüsseln!",
@@ -1984,7 +1966,7 @@
             },
             "room_is_public": "Dieser Raum ist öffentlich"
         },
-        "header_avatar_open_settings_label": "Chatroomeinstellungen öffnen",
+        "header_avatar_open_settings_label": "Raumeinstellungen öffnen",
         "header_face_pile_tooltip": "Personen",
         "header_untrusted_label": "Nicht vertrauenswürdig",
         "inaccessible": "Dieser Raum oder Space ist im Moment nicht zugänglich.",
@@ -2009,7 +1991,6 @@
             "you_created": "Du hast diesen Raum erstellt."
         },
         "invite_email_mismatch_suggestion": "Teile diese E-Mail-Adresse in den Einstellungen, um Einladungen direkt in %(brand)s zu erhalten.",
-        "invite_reject_ignore": "Ablehnen und Benutzer blockieren",
         "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/>",
@@ -2105,6 +2086,7 @@
             },
             "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",
         "waiting_for_join_title": "Warte darauf, dass Benutzer %(brand)s beitreten"
     },
@@ -2119,11 +2101,14 @@
             "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",
+            "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",
@@ -2131,9 +2116,11 @@
         "failed_set_dm_tag": "Fehler beim Setzen der Nachrichtenmarkierung",
         "filters": {
             "favourite": "Favoriten",
+            "invites": "Einladungen",
+            "mentions": "Erwähnungen",
             "people": "Personen",
             "rooms": "Räume",
-            "unread": "Ungelesen"
+            "unread": "Ungelesene"
         },
         "home_menu_label": "Startseiteneinstellungen",
         "join_public_room_label": "Öffentlichen Raum betreten",
@@ -2161,15 +2148,21 @@
             "more_options": "Weitere Optionen",
             "open_room": "Raum öffnen %(roomName)s"
         },
+        "room_options": "Chatroomoptionen",
         "show_less": "Weniger anzeigen",
         "show_n_more": {
             "other": "%(count)s weitere anzeigen",
             "one": "%(count)s weitere anzeigen"
         },
         "show_previews": "Nachrichtenvorschau anzeigen",
+        "sort": "Sortieren",
         "sort_by": "Sortieren nach",
         "sort_by_activity": "Aktivität",
         "sort_by_alphabet": "A–Z",
+        "sort_type": {
+            "activity": "Aktivität",
+            "atoz": "A–Z"
+        },
         "sort_unread_first": "Räume mit ungelesenen Nachrichten zuerst zeigen",
         "space_menu": {
             "home": "Space-Übersicht",
@@ -2457,6 +2450,10 @@
         "recent_changes_heading": "Letzte Änderungen, die noch nicht eingegangen sind",
         "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.",
+        "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",
@@ -2535,6 +2532,7 @@
                 "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.",
                 "details_title": "Angaben zur Verschlüsselung",
                 "do_not_close_warning": "Schließen Sie dieses Fenster nicht, bis der Reset abgeschlossen ist",
@@ -2549,6 +2547,8 @@
                 "session_key": "Sitzungsschlüssel:",
                 "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>",
             "delete_key_storage": {
                 "breadcrumb_page": "Schlüsselspeicher löschen",
                 "confirm": "Schlüsselspeicher löschen",
@@ -2634,6 +2634,7 @@
             "discovery_needs_terms_title": "Lassen Sie sich von anderen 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_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",
@@ -2658,7 +2659,9 @@
             "error_share_msisdn_discovery": "Teilen der Telefonnummer nicht möglich",
             "identity_server_no_token": "Kein Identitäts-Zugangs-Token gefunden",
             "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_in_use": "Diese Telefonnummer wird bereits verwendet",
             "msisdn_label": "Telefonnummer",
             "msisdn_verification_field_label": "Bestätigungscode",
@@ -2677,12 +2680,10 @@
             "unable_to_load_msisdns": "Telefonnummern können nicht geladen werden",
             "username": "Benutzername"
         },
-        "image_thumbnails": "Vorschauen für Bilder",
         "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",
         "insert_trailing_colon_mentions": "Doppelpunkt nach Erwähnungen einfügen",
-        "invite_avatars": "Zeigen Sie Avatare von Chatrooms an, zu denen Sie eingeladen wurden",
         "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).",
@@ -2741,6 +2742,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Einstellungen:</strong> Blockierte Benutzer"
         },
+        "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",
+            "media_preview_label": "Medien in der Zeitleiste anzeigen",
+            "show_in_private": "In privaten Chatrooms",
+            "show_media": "Immer anzeigen"
+        },
         "notifications": {
             "default_setting_description": "Diese Einstellung wird standardmäßig für all deine Räume übernommen.",
             "default_setting_section": "Ich möchte benachrichtigt werden für (Standardeinstellung)",
@@ -2826,57 +2835,20 @@
         "prompt_invite": "Warnen, bevor du Einladungen zu ungültigen Matrix-IDs sendest",
         "replace_plain_emoji": "Klartext-Emoji automatisch ersetzen",
         "security": {
-            "4s_public_key_in_account_data": "in den Kontodaten",
-            "4s_public_key_status": "Öffentlicher Schlüssel des sicheren Speichers:",
             "analytics_description": "Anonym Daten teilen um bei der Identifizierung von Fehlern zu helfen. Keine persönlichen Daten. Keine Daten von Dritt-Anbietern.",
-            "backup_key_cached_status": "Sicherungsschlüssel zwischengespeichert:",
-            "backup_key_stored_status": "Sicherungsschlüssel gespeichert:",
-            "backup_key_unexpected_type": "unbekannter Typ",
-            "backup_key_well_formed": "wohlgeformt",
-            "backup_keys_description": "Sichern Sie Ihren Chiffrierschlüssel zusammen mit Ihren Kontodaten, für den Fall, dass Sie den Zugriff auf Ihre Sitzungen verlieren. Ihre Schlüssel werden mit einem unikalen Wiederherstellungsschlüssel geschützt.",
             "bulk_options_accept_all_invites": "Akzeptiere alle %(invitedRooms)s Einladungen",
             "bulk_options_reject_all_invites": "Alle %(invitedRooms)s Einladungen ablehnen",
             "bulk_options_section": "Sammeloptionen",
-            "cross_signing_cached": "lokal zwischengespeichert",
-            "cross_signing_homeserver_support": "Unterstützung des Heim-Servers:",
-            "cross_signing_homeserver_support_exists": "existiert",
-            "cross_signing_in_4s": "im Schlüsselspeicher",
-            "cross_signing_in_memory": "im Speicher",
-            "cross_signing_master_private_Key": "Privater Hauptschlüssel:",
-            "cross_signing_not_cached": "lokal nicht gefunden",
-            "cross_signing_not_found": "nicht gefunden",
-            "cross_signing_not_in_4s": "nicht im Speicher gefunden",
-            "cross_signing_not_stored": "nicht gespeichert",
-            "cross_signing_private_keys": "Private Quersignaturschlüssel:",
-            "cross_signing_public_keys": "Öffentlicher Quersignaturschlüssel:",
-            "cross_signing_self_signing_private_key": "Selbst signierter privater Schlüssel:",
-            "cross_signing_user_signing_private_key": "Privater Benutzerschlüssel:",
-            "cryptography_section": "Verschlüsselung",
             "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_enabled": "Offline-Gerät aktiviert",
-            "delete_backup": "Lösche Sicherung",
-            "delete_backup_confirm_description": "Bist du sicher? Du wirst alle deine verschlüsselten Nachrichten verlieren, wenn deine Schlüssel nicht gut gesichert sind.",
             "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",
             "encryption_section": "Verschlüsselung",
-            "error_loading_key_backup_status": "Konnte Status der Schlüsselsicherung nicht laden",
-            "export_megolm_keys": "E2E-Raumschlüssel exportieren",
             "ignore_users_empty": "Sie haben keinen Benutzer blockiert.",
             "ignore_users_section": "Blockierte Benutzer",
-            "import_megolm_keys": "E2E-Raumschlüssel importieren",
-            "key_backup_active": "Diese Sitzung sichert deine Schlüssel.",
-            "key_backup_active_version": "Aktive Backup-Version:",
-            "key_backup_active_version_none": "Nichts",
             "key_backup_algorithm": "Algorithmus:",
-            "key_backup_can_be_restored": "Dieses Backup kann in dieser Sitzung wiederhergestellt werden",
-            "key_backup_complete": "Alle Schlüssel gesichert",
             "key_backup_connect": "Verbinde diese Sitzung mit einer Schlüsselsicherung",
-            "key_backup_connect_prompt": "Verbinde diese Sitzung mit deiner Schlüsselsicherung bevor du dich abmeldest, um den Verlust von Schlüsseln zu vermeiden.",
-            "key_backup_in_progress": "Sichere %(sessionsRemaining)s Schlüssel …",
-            "key_backup_inactive": "Diese Sitzung <b>sichert deine Schlüssel nicht</b>, aber du hast eine vorhandene Sicherung, die du wiederherstellen und in Zukunft hinzufügen kannst.",
-            "key_backup_inactive_warning": "Deine Schlüssel werden von dieser Sitzung <b>nicht gesichert</b>.",
-            "key_backup_latest_version": "Letzte Backup-Version auf diesen Server:",
             "message_search_disable_warning": "Wenn deaktiviert, werden Nachrichten von verschlüsselten Räumen nicht in den Ergebnissen auftauchen.",
             "message_search_disabled": "Speichere verschlüsselte Nachrichten lokal, sodass sie deinen Suchergebnissen erscheinen können.",
             "message_search_enabled": {
@@ -2896,13 +2868,7 @@
             "message_search_unsupported": "Um verschlüsselte Nachrichten lokal zu durchsuchen, benötigt %(brand)s weitere Komponenten. Wenn du diese Funktion testen möchtest, kannst du dir deine eigene Version von %(brand)s Desktop mit der <nativeLink>integrierten Suchfunktion kompilieren</nativeLink>.",
             "message_search_unsupported_web": "Das Durchsuchen von verschlüsselten Nachrichten wird aus Sicherheitsgründen nur von %(brand)s Desktop unterstützt. <desktopLink>Hier gehts zum Download</desktopLink>.",
             "record_session_details": "Bezeichnung, Version und URL der Anwendung registrieren, damit diese Sitzung in der Sitzungsverwaltung besser erkennbar ist",
-            "restore_key_backup": "Von Sicherung wiederherstellen",
-            "secret_storage_not_ready": "nicht bereit",
-            "secret_storage_ready": "bereit",
-            "secret_storage_status": "Sicherer Speicher:",
             "send_analytics": "Analysedaten senden",
-            "session_id": "Sitzungs-ID:",
-            "session_key": "Sitzungsschlüssel:",
             "strict_encryption": "Senden Sie Nachrichten nur an verifizierte Benutzer"
         },
         "send_read_receipts": "Sende Lesebestätigungen",
@@ -3145,8 +3111,6 @@
         "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",
-        "tovirtual": "Zum virtuellen Raum dieses Raums wechseln, sofern vorhanden",
-        "tovirtual_not_found": "Kein virtueller Raum für diesen Raum",
         "unban": "Entsperrt den Benutzer mit der angegebenen ID",
         "unflip": "Stellt ┬──┬ ノ( ゜-゜ノ) einer Klartextnachricht voran",
         "unholdcall": "Beendet das Halten des Anrufs",
@@ -3269,7 +3233,7 @@
         "heading_without_query": "Suche nach",
         "join_button_text": "%(roomAddress)s betreten",
         "keyboard_scroll_hint": "Benutze <arrows/> zum Scrollen",
-        "message_search_section_title": "Andere Suchen",
+        "messages_label": "Nachrichten",
         "other_rooms_in_space": "Andere Räume in %(spaceName)s",
         "public_rooms_label": "Öffentliche Räume",
         "public_spaces_label": "Öffentliche Spaces",
@@ -3279,7 +3243,6 @@
         "result_may_be_hidden_privacy_warning": "Einige Vorschläge könnten aus Gründen der Privatsphäre ausgeblendet sein",
         "result_may_be_hidden_warning": "Einige Ergebnisse können ausgeblendet sein",
         "search_dialog": "Suchdialog",
-        "search_messages_hint": "Wenn du Nachrichten durchsuchen willst, klicke auf das <icon/> Icon oberhalb des Raumes",
         "spaces_title": "Spaces, in denen du Mitglied bist",
         "start_group_chat_button": "Gruppenunterhaltung beginnen"
     },
@@ -3328,9 +3291,7 @@
     "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.",
-        "release_announcement_description": "Die Thread-Benachrichtigungen wurden verschoben. Sie finden sie ab sofort hier.",
-        "release_announcement_header": "Thread Aktivitätszentrum"
+        "no_rooms_with_unread_threads": "Sie haben noch keine Chatrooms mit ungelesenen Threads."
     },
     "time": {
         "about_day_ago": "vor etwa einem Tag",
@@ -3841,10 +3802,11 @@
         "unavailable": "Nicht verfügbar"
     },
     "update_room_access_modal": {
-        "description": "Um einen Link zum Teilen zu erstellen, müssen Sie Gästen erlauben, diesem Chatroom beizutreten. Dadurch kann der Chatroom weniger sicher werden. Wenn Sie mit dem Anruf fertig sind, können Sie den Raum wieder privat machen.",
-        "dont_change_description": "Sie können den Anruf auch in einem separaten Chatroom führen.",
+        "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.",
         "no_change": "Ich möchte die Zugriffsebene nicht ändern.",
-        "title": "Ändern Sie die Zugriffsebene des Chatrooms."
+        "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"
     },
     "upload_failed_generic": "Die Datei „%(fileName)s“ konnte nicht hochgeladen werden.",
     "upload_failed_size": "Die Datei „%(fileName)s“ überschreitet das Hochladelimit deines Heim-Servers",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 3307ece5e5..662d56b6d5 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -9,15 +9,16 @@
             "one": "1 μη αναγνωσμένη αναφορά.",
             "other": "%(count)s μη αναγνωσμένα μηνύματα συμπεριλαμβανομένων των αναφορών."
         },
-        "room_name": "Δωμάτιο %(name)s",
+        "recent_rooms": "Πρόσφατες αίθουσες",
+        "room_name": "Αίθουσα %(name)s",
         "unread_messages": "Μη αναγνωσμένα μηνύματα.",
         "user_menu": "Μενού χρήστη"
     },
-    "a11y_jump_first_unread_room": "Μετάβαση στο πρώτο μη αναγνωσμένο δωμάτιο.",
+    "a11y_jump_first_unread_room": "Μετάβαση στην πρώτη μη αναγνωσμένη αίθουσα.",
     "action": {
         "accept": "Αποδοχή",
         "add": "Προσθήκη",
-        "add_existing_room": "Προσθήκη υπάρχοντος δωματίου",
+        "add_existing_room": "Προσθήκη υπάρχουσας αίθουσας",
         "add_people": "Προσθήκη ατόμων",
         "apply": "Εφαρμογή",
         "approve": "Έγκριση",
@@ -37,7 +38,7 @@
         "copy": "Αντιγραφή",
         "copy_link": "Αντιγραφή συνδέσμου",
         "create": "Δημιουργία",
-        "create_a_room": "Δημιουργήστε ένα δωμάτιο",
+        "create_a_room": "Δημιουργήστε μία αίθουσα",
         "create_account": "Δημιουργία Λογαριασμού",
         "decline": "Απόρριψη",
         "delete": "Διαγραφή",
@@ -50,8 +51,8 @@
         "edit": "Επεξεργασία",
         "enable": "Ενεργοποίηση",
         "expand": "Επέκταση",
-        "explore_public_rooms": "Εξερευνήστε δημόσια δωμάτια",
-        "explore_rooms": "Εξερευνήστε δωμάτια",
+        "explore_public_rooms": "Εξερευνήστε δημόσιες αίθουσες",
+        "explore_rooms": "Εξερευνήστε αίθουσες",
         "export": "Εξαγωγή",
         "forward": "Προώθηση",
         "go": "Μετάβαση",
@@ -67,14 +68,14 @@
         "join": "Συμμετοχή",
         "learn_more": "Μάθετε περισσότερα",
         "leave": "Αποχώρηση",
-        "leave_room": "Αποχώρηση από το δωμάτιο",
+        "leave_room": "Αποχώρηση από την αίθουσα",
         "logout": "Αποσύνδεση",
         "manage": "Διαχειριστείτε",
         "maximise": "Μεγιστοποίηση",
         "mention": "Αναφορά",
         "minimise": "Ελαχιστοποίηση",
-        "new_room": "Νέο δωμάτιο",
-        "new_video_room": "Νέο δωμάτιο βίντεο",
+        "new_room": "Νέα αίθουσα",
+        "new_video_room": "Νέα αίθουσα βίντεο",
         "next": "Επόμενο",
         "no": "Όχι",
         "ok": "Εντάξει",
@@ -87,7 +88,6 @@
         "react": "Αντίδραση",
         "refresh": "Ανανέωση",
         "register": "Εγγραφή",
-        "reject": "Απόρριψη",
         "reload": "Επαναφόρτωση",
         "remove": "Αφαίρεση",
         "rename": "Μετονομασία",
@@ -207,7 +207,7 @@
         },
         "misconfigured_body": "Ζητήστε από τον %(brand)s διαχειριστή σας να ελέγξει <a>τις ρυθμίσεις σας</a> για λανθασμένες ή διπλότυπες καταχωρίσεις.",
         "misconfigured_title": "Οι παράμετροι του %(brand)s σας είναι λανθασμένα ρυθμισμένοι",
-        "msisdn_field_description": "Άλλοι χρήστες μπορούν να σας προσκαλέσουν σε δωμάτια χρησιμοποιώντας τα στοιχεία επικοινωνίας σας",
+        "msisdn_field_description": "Άλλοι χρήστες μπορούν να σας προσκαλέσουν σε αίθουσες χρησιμοποιώντας τα στοιχεία επικοινωνίας σας",
         "msisdn_field_label": "Τηλέφωνο",
         "msisdn_field_number_invalid": "Αυτός ο αριθμός τηλεφώνου δε φαίνεται σωστός, ελέγξτε και δοκιμάστε ξανά",
         "msisdn_field_required_invalid": "Εισάγετε αριθμό τηλεφώνου",
@@ -282,7 +282,7 @@
         "sso_complete_in_browser_dialog_title": "Μεταβείτε στο πρόγραμμα περιήγησής σας για να ολοκληρώσετε τη σύνδεση",
         "sso_failed_missing_storage": "Ζητήσαμε από το πρόγραμμα περιήγησης να θυμάται τον διακομιστή που χρησιμοποιείτε για να συνδέεστε, αλλά το πρόγραμμα περιήγησης δεν το έχει αποθηκεύσει. Πηγαίνετε στην σελίδα σύνδεσεις για να προσπαθήσετε ξανά.",
         "sso_or_username_password": "%(ssoButtons)s Ή %(usernamePassword)s",
-        "sync_footer_subtitle": "Εάν έχετε συμμετάσχει σε πολλά δωμάτια, αυτό μπορεί να διαρκέσει λίγο",
+        "sync_footer_subtitle": "Εάν έχετε συμμετάσχει σε πολλές αίθουσες, αυτό μπορεί να διαρκέσει λίγο",
         "uia": {
             "code": "Κωδικός",
             "email_auth_header": "Ελέγξτε το email σας για να συνεχίσετε",
@@ -307,12 +307,12 @@
         "username_in_use": "Κάποιος έχει ήδη αυτό το όνομα χρήστη, δοκιμάστε ένα άλλο."
     },
     "bug_reporting": {
-        "additional_context": "Εάν υπάρχουν πρόσθετες ππληροφορίες που θα βοηθούσαν στην ανάλυση του ζητήματος, όπως τι κάνατε εκείνη τη στιγμή, αναγνωριστικά δωματίων, αναγνωριστικά χρηστών κ.λπ., συμπεριλάβετε τα εδώ.",
+        "additional_context": "Εάν υπάρχουν πρόσθετες πληροφορίες που θα βοηθούσαν στην ανάλυση του ζητήματος, όπως τι κάνατε εκείνη τη στιγμή, αναγνωριστικά αιθουσών, αναγνωριστικά χρηστών κ.λπ., συμπεριλάβετέ τα εδώ.",
         "before_submitting": "Προτού υποβάλετε αρχεία καταγραφής, πρέπει να <a>δημιουργήσετε ένα ζήτημα GitHub</a> για να περιγράψετε το πρόβλημά σας.",
         "collecting_information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
         "collecting_logs": "Συγκέντρωση πληροφοριών",
         "create_new_issue": "Παρακαλούμε <newIssueLink>δημιουργήστε ένα νέο issue</newIssueLink> στο GitHub ώστε να μπορέσουμε να διερευνήσουμε αυτό το σφάλμα.",
-        "description": "Τα αρχεία καταγραφής εντοπισμού σφαλμάτων περιέχουν δεδομένα χρήσης εφαρμογών, συμπεριλαμβανομένου του ονόματος χρήστη σας, των αναγνωριστικών ή των ψευδωνύμων των δωματίων που έχετε επισκεφτεί, των στοιχείων διεπαφής χρήστη με τα οποία αλληλεπιδράσατε τελευταία και των ονομάτων χρήστη άλλων χρηστών. Δεν περιέχουν μηνύματα.",
+        "description": "Τα αρχεία καταγραφής εντοπισμού σφαλμάτων περιέχουν δεδομένα χρήσης εφαρμογών, συμπεριλαμβανομένου του ονόματος χρήστη σας, των αναγνωριστικών ή των ψευδωνύμων των αιθουσών που έχετε επισκεφτεί, των στοιχείων διεπαφής χρήστη με τα οποία αλληλεπιδράσατε τελευταία και των ονομάτων χρήστη άλλων χρηστών. Δεν περιέχουν μηνύματα.",
         "download_logs": "Λήψη αρχείων καταγραφής",
         "downloading_logs": "Λήψη αρχείων καταγραφής",
         "error_empty": "Πείτε μας τι πήγε στραβά ή, καλύτερα, δημιουργήστε ένα ζήτημα στο GitHub που να περιγράφει το πρόβλημα.",
@@ -368,7 +368,6 @@
         "capabilities": "Δυνατότητες",
         "copied": "Αντιγράφηκε!",
         "credits": "Συντελεστές",
-        "cross_signing": "Διασταυρούμενη υπογραφή",
         "dark": "Σκούρο",
         "description": "Περιγραφή",
         "deselect_all": "Αποεπιλογή όλων",
@@ -424,7 +423,7 @@
         "offline": "Εκτός σύνδεσης",
         "on": "Ενεργό",
         "options": "Επιλογές",
-        "orphan_rooms": "Άλλα δωμάτια",
+        "orphan_rooms": "Άλλες αίθουσες",
         "password": "Κωδικός πρόσβασης",
         "people": "Άτομα",
         "preferences": "Προτιμήσεις",
@@ -432,19 +431,19 @@
         "preview_message": "Είσαι ο καλύτερος!",
         "privacy": "Ιδιωτικότητα",
         "private": "Ιδιωτικό",
-        "private_room": "Ιδιωτικό δωμάτιο",
+        "private_room": "Ιδιωτική αίθουσα",
         "private_space": "Ιδιωτικός χώρος",
         "profile": "Προφίλ",
         "public": "Δημόσιο",
-        "public_room": "Δημόσιο δωμάτιο",
+        "public_room": "Δημόσια αίθουσα",
         "public_space": "Δημόσιος χώρος",
         "qr_code": "Κωδικός QR",
         "random": "Τυχαία",
         "reactions": "Αντιδράσεις",
         "report_a_bug": "Αναφορά σφάλματος",
-        "room": "Δωμάτιο",
-        "room_name": "Όνομα δωματίου",
-        "rooms": "Δωμάτια",
+        "room": "Αίθουσα",
+        "room_name": "Όνομα αίθουσας",
+        "rooms": "Αίθουσες",
         "secure_backup": "Ασφαλές αντίγραφο ασφαλείας",
         "select_all": "Επιλογή όλων",
         "server": "Διακομιστής",
@@ -463,10 +462,10 @@
         "theme": "Θέμα",
         "thread": "Νήμα",
         "threads": "Νήμα εκτέλεσης",
-        "timeline": "Χρονοδιάγραμμα",
+        "timeline": "Χρονολόγιο",
         "unencrypted": "Μη κρυπτογραφημένο",
         "unmute": "Άρση σίγασης",
-        "unnamed_room": "Ανώνυμο δωμάτιο",
+        "unnamed_room": "Ανώνυμη αίθουσα",
         "unnamed_space": "Χώρος χωρίς όνομα",
         "unverified": "Μη επαληθευμένη",
         "user": "Χρήστης",
@@ -476,13 +475,13 @@
         "verified": "Επαληθευμένη",
         "version": "Έκδοση",
         "video": "Βίντεο",
-        "video_room": "Δωμάτια βίντεο",
+        "video_room": "Αίθουσα βίντεο",
         "view_message": "Προβολή μηνύματος",
         "warning": "Προειδοποίηση"
     },
     "composer": {
         "autocomplete": {
-            "@room_description": "Ειδοποιήστε όλο το δωμάτιο",
+            "@room_description": "Ειδοποιήστε όλη την αίθουσα",
             "command_a11y": "Αυτόματη συμπλήρωση εντολών",
             "command_description": "Εντολές",
             "emoji_a11y": "Αυτόματη συμπλήρωση Emoji",
@@ -544,7 +543,7 @@
         "join_rule_public_label": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτό το δωμάτιο.",
         "join_rule_public_parent_space_label": "Οποιοσδήποτε θα μπορεί να βρει και να εγγραφεί σε αυτόν τον χώρο, όχι μόνο μέλη του <SpaceName/>.",
         "join_rule_restricted": "Ορατό στα μέλη του χώρου",
-        "join_rule_restricted_label": "Όλοι στο <SpaceName/> θα μπορούν να βρουν και να συμμετάσχουν σε αυτό το δωμάτιο.",
+        "join_rule_restricted_label": "Όλοι στο <SpaceName/> θα μπορούν να βρουν και να συμμετάσχουν σε αυτήν την αίθουσα.",
         "name_validation_required": "Εισάγετε ένα όνομα για το δωμάτιο",
         "room_visibility_label": "Ορατότητα δωματίου",
         "title_private_room": "Δημιουργήστε ένα ιδιωτικό δωμάτιο",
@@ -630,15 +629,15 @@
         "id": "ID: ",
         "invalid_json": "Δε μοιάζει με έγκυρο JSON.",
         "level": "Επίπεδο",
-        "main_timeline": "Κύριο χρονοδιάγραμμα",
+        "main_timeline": "Κύριο χρονολόγιο",
         "no_receipt_found": "Δεν βρέθηκε απόδειξη",
         "notification_state": "Η κατάσταση ειδοποίησης είναι <strong>%(notificationState)s</strong>",
         "notifications_debug": "Αποσφαλμάτωση ειδοποιήσεων",
         "number_of_users": "Αριθμός χρηστών",
         "original_event_source": "Αρχική πηγή συμβάντος",
-        "room_encrypted": "Το δωμάτιο είναι <strong>κρυπτογραφημένο ✅</strong>",
+        "room_encrypted": "Η αίθουσα είναι <strong>κρυπτογραφημένη ✅</strong>",
         "room_id": "ID δωματίου: %(roomId)s",
-        "room_not_encrypted": "Το δωμάτιο <strong>δεν είναι κρυπτογραφημένο 🚨</strong>",
+        "room_not_encrypted": "Η αίθουσα <strong>δεν είναι κρυπτογραφημένη 🚨</strong>",
         "room_notifications_dot": "Σημείο: ",
         "room_notifications_highlight": "Αποκορύφωμα: ",
         "room_notifications_last_event": "Τελευταίο γεγονός:",
@@ -665,14 +664,14 @@
         "setting_definition": "Ορισμός ρύθμισης:",
         "setting_id": "Ρύθμιση αναγνωριστικού",
         "settings_explorer": "Εξερεύνηση ρυθμίσεων",
-        "show_hidden_events": "Εμφάνιση κρυφών συμβάντων στη γραμμή χρόνου",
+        "show_hidden_events": "Εμφάνιση κρυφών συμβάντων στο χρονολόγιο",
         "spaces": {
             "one": "<χώρος>",
             "other": "<%(count)s χώροι>"
         },
         "state_key": "Κλειδί κατάστασης",
         "thread_root_id": "Thread Root ID: %(threadRootId)s",
-        "threads_timeline": "Χρονοδιάγραμμα νημάτων",
+        "threads_timeline": "Χρονολόγιο νημάτων",
         "title": "Εργαλεία προγραμματιστή",
         "toggle_event": "μεταβολή συμβάντος",
         "toolbox": "Εργαλειοθήκη",
@@ -683,12 +682,12 @@
         "user_read_up_to_private_ignore_synthetic": "Ο χρήστης διάβασε ως (m.read.private;ignoreSynthetic): ",
         "value": "Τιμή",
         "value_colon": "Τιμή:",
-        "value_in_this_room": "Τιμή σε αυτό το δωμάτιο",
-        "value_this_room_colon": "Τιμή σε αυτό το δωμάτιο:",
+        "value_in_this_room": "Τιμή σε αυτήν την αίθουσα",
+        "value_this_room_colon": "Τιμή σε αυτήν την αίθουσα:",
         "values_explicit": "Αξίες σε σαφής επίπεδα",
         "values_explicit_colon": "Τιμές σε σαφή επίπεδα:",
         "values_explicit_room": "Αξίες σε σαφής επίπεδα σε αυτό το δωμάτιο",
-        "values_explicit_this_room_colon": "Τιμές σε σαφή επίπεδα σε αυτό το δωμάτιο:",
+        "values_explicit_this_room_colon": "Τιμές σε ρητά επίπεδα σε αυτήν την αίθουσα:",
         "view_servers_in_room": "Προβολή διακομιστών στο δωμάτιο",
         "view_source_decrypted_event_source": "Αποκρυπτογραφημένη πηγή συμβάντος",
         "widget_screenshots": "Ενεργοποίηση στιγμιότυπων οθόνης μικροεφαρμογών σε υποστηριζόμενες μικροεφαρμογές"
@@ -714,43 +713,23 @@
     "empty_room": "Άδειο δωμάτιο",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Εισαγάγετε τη Φράση Ασφαλείας ή <button>χρησιμοποιήστε το Κλειδί Ασφαλείας</button> για να συνεχίσετε.",
             "key_validation_text": {
-                "invalid_security_key": "Μη έγκυρο Κλειδί Ασφαλείας",
-                "recovery_key_is_correct": "Φαίνεται καλό!",
-                "wrong_file_type": "Λάθος τύπος αρχείου",
                 "wrong_security_key": "Λάθος Κλειδί Ασφαλείας"
             },
-            "reset_title": "Επαναφορά όλων",
-            "reset_warning_1": "Κάντε αυτό μόνο όταν δεν έχετε άλλη συσκευή για να ολοκληρώσετε την επαλήθευση.",
-            "reset_warning_2": "Εάν επαναφέρετε τα πάντα, θα κάνετε επανεκκίνηση χωρίς αξιόπιστες συνεδρίες, χωρίς αξιόπιστους χρήστες και ενδέχεται να μην μπορείτε να δείτε προηγούμενα μηνύματα.",
             "restoring": "Επαναφορά κλειδιών από αντίγραφο ασφαλείας",
-            "security_key_title": "Κλειδί Ασφαλείας",
-            "security_phrase_incorrect_error": "Δεν είναι δυνατή η πρόσβαση στον κρυφό χώρο αποθήκευσης. Βεβαιωθείτε ότι έχετε εισαγάγει τη σωστή Φράση Ασφαλείας.",
-            "security_phrase_title": "Φράση Ασφαλείας",
-            "use_security_key_prompt": "Χρησιμοποιήστε το Κλειδί Ασφαλείας σας για να συνεχίσετε."
+            "security_key_title": "Κλειδί Ασφαλείας"
         },
         "bootstrap_title": "Ρύθμιση κλειδιών",
         "cancel_entering_passphrase_description": "Είστε σίγουρος/η ότι θέλετε να ακυρώσετε την εισαγωγή κωδικού;",
         "cancel_entering_passphrase_title": "Ακύρωση εισαγωγής κωδικού;",
         "confirm_encryption_setup_body": "Κάντε κλικ στο κουμπί παρακάτω για να επιβεβαιώσετε τη ρύθμιση της κρυπτογράφησης.",
         "confirm_encryption_setup_title": "Επιβεβαιώστε τη ρύθμιση κρυπτογράφησης",
-        "cross_signing_not_ready": "Η διασταυρούμενη υπογραφή δεν έχει ρυθμιστεί.",
-        "cross_signing_ready": "Η διασταυρούμενη υπογραφή είναι έτοιμη για χρήση.",
-        "cross_signing_ready_no_backup": "Η διασταυρούμενη υπογραφή είναι έτοιμη, αλλά δεν δημιουργούνται αντίγραφα ασφαλείας κλειδιών.",
         "cross_signing_room_normal": "Αυτό το δωμάτιο έχει κρυπτογράφηση από άκρο σε άκρο",
-        "cross_signing_room_verified": "Όλοι σε αυτό το δωμάτιο έχουν επαληθευτεί",
+        "cross_signing_room_verified": "Όλοι σε αυτήν την αίθουσα έχουν επαληθευτεί",
         "cross_signing_room_warning": "Κάποιος χρησιμοποιεί μια άγνωστη συνεδρία",
-        "cross_signing_unsupported": "Ο κεντρικός σας διακομιστής δεν υποστηρίζει διασταυρούμενη σύνδεση.",
-        "cross_signing_untrusted": "Ο λογαριασμός σας έχει ταυτότητα διασταυρούμενης υπογραφής σε μυστικό χώρο αποθήκευσης, αλλά δεν είναι ακόμη αξιόπιστος από αυτήν την συνεδρία.",
         "cross_signing_user_normal": "Δεν έχετε επαληθεύσει αυτόν τον χρήστη.",
         "cross_signing_user_verified": "Έχετε επαληθεύσει αυτόν τον χρήστη. Αυτός ο χρήστης έχει επαληθεύσει όλες τις συνεδρίες του.",
         "cross_signing_user_warning": "Αυτός ο χρήστης δεν έχει επαληθεύσει όλες τις συνεδρίες του.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Διαγράψτε τα κλειδιά διασταυρούμενης υπογραφής",
-            "title": "Να καταστραφούν τα κλειδιά διασταυρούμενης υπογραφής;",
-            "warning": "Η διαγραφή κλειδιών διασταυρούμενης υπογραφής είναι μόνιμη. Οποιοσδήποτε με τον οποίο έχετε επαληθευτεί θα λάβει ειδοποιήσεις ασφαλείας. Πιθανότατα δεν θέλετε να το κάνετε αυτό, εκτός και αν έχετε χάσει όλες τις συσκευές από τις οποίες μπορείτε να υπογράψετε."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Η αυθεντικότητα αυτού του κρυπτογραφημένου μηνύματος δεν είναι εγγυημένη σε αυτήν τη συσκευή.",
         "event_shield_reason_mismatched_sender_key": "Κρυπτογραφήθηκε από μια μη επαληθευμένη συνεδρία",
         "export_unsupported": "Ο περιηγητής σας δεν υποστηρίζει τα απαιτούμενα πρόσθετα κρυπτογράφησης",
@@ -770,7 +749,6 @@
             "title": "Νέα Μέθοδος Ανάκτησης",
             "warning": "Εάν δεν έχετε ορίσει τη νέα μέθοδο ανάκτησης, ένας εισβολέας μπορεί να προσπαθεί να αποκτήσει πρόσβαση στον λογαριασμό σας. Αλλάξτε τον κωδικό πρόσβασης του λογαριασμού σας και ορίστε μια νέα μέθοδο ανάκτησης αμέσως στις Ρυθμίσεις."
         },
-        "not_supported": "<δεν υποστηρίζεται>",
         "recovery_method_removed": {
             "description_1": "Αυτή η συνεδρία εντόπισε ότι η φράση ασφαλείας σας και το κλειδί για τα ασφαλή μηνύματα σας έχουν αφαιρεθεί.",
             "description_2": "Εάν το κάνατε κατά λάθος, μπορείτε να ρυθμίσετε τα Ασφαλή Μηνύματα σε αυτήν τη συνεδρία, τα οποία θα κρυπτογραφούν εκ νέου το ιστορικό μηνυμάτων αυτής της συνεδρίας με μια νέα μέθοδο ανάκτησης.",
@@ -781,8 +759,7 @@
         "set_up_toast_description": "Προστατευτείτε από την απώλεια πρόσβασης σε κρυπτογραφημένα μηνύματα και δεδομένα",
         "set_up_toast_title": "Ρυθμίστε το αντίγραφο ασφαλείας",
         "setup_secure_backup": {
-            "explainer": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε για να μην τα χάσετε.",
-            "title": "Εγκατάσταση"
+            "explainer": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε για να μην τα χάσετε."
         },
         "udd": {
             "other_ask_verify_text": "Ζητήστε από αυτόν τον χρήστη να επιβεβαιώσει την συνεδρία του, ή επιβεβαιώστε την χειροκίνητα παρακάτω.",
@@ -796,7 +773,6 @@
             "accepting": "Αποδοχή …",
             "after_new_login": {
                 "device_verified": "Η συσκευή επαληθεύτηκε",
-                "reset_confirmation": "Είστε σίγουρος ότι θέλετε να επαναφέρετε τα κλειδιά επαλήθευσης;",
                 "skip_verification": "Παράβλεψη επαλήθευσης προς το παρόν",
                 "unable_to_verify": "Αδυναμία επαλήθευσης αυτής της συσκευής",
                 "verify_this_device": "Επαληθεύστε αυτήν τη συσκευή"
@@ -859,7 +835,6 @@
             "verify_emoji_prompt": "Επαληθεύστε συγκρίνοντας μοναδικά emoji.",
             "verify_emoji_prompt_qr": "Εάν δεν μπορείτε να σαρώσετε τον παραπάνω κώδικα, επαληθεύστε το συγκρίνοντας μοναδικά emoji.",
             "verify_later": "Θα επαληθεύσω αργότερα",
-            "verify_reset_warning_1": "Δεν είναι δυνατή η αναίρεση της επαναφοράς των κλειδιών επαλήθευσης. Μετά την επαναφορά, δε θα έχετε πρόσβαση σε παλιά κρυπτογραφημένα μηνύματα και όλοι οι φίλοι που σας έχουν προηγουμένως επαληθεύσει θα βλέπουν προειδοποιήσεις ασφαλείας μέχρι να επαληθεύσετε ξανά μαζί τους.",
             "verify_using_device": "Επαλήθευση με άλλη συσκευή",
             "verify_using_key": "Επαλήθευση με Κλειδί ασφαλείας",
             "verify_using_key_or_phrase": "Επαλήθευση με Κλειδί Ασφαλείας ή Φράση Ασφαλείας",
@@ -914,11 +889,7 @@
             "title": "Αδυναμία αντιγραφής του συνδέσμου δωματίου"
         },
         "error_loading_user_profile": "Αδυναμία φόρτωσης του προφίλ χρήστη",
-        "forget_room_failed": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)",
-        "search_failed": {
-            "server_unavailable": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή να έχει λήξει η αναζήτηση :(",
-            "title": "Η αναζήτηση απέτυχε"
-        }
+        "forget_room_failed": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1174,13 +1145,13 @@
         "page_up": "Σελίδα προς τα πάνω",
         "prev_room": "Προηγούμενο δωμάτιο ή ΑΜ",
         "prev_unread_room": "Προηγούμενο μη αναγνωσμένο δωμάτιο ή ΑΜ",
-        "room_list_collapse_section": "Σύμπτυξη ενότητας λίστας δωματίων",
+        "room_list_collapse_section": "Σύμπτυξη ενότητας λίστας αιθουσών",
         "room_list_expand_section": "Ανάπτυξη ενότητας λίστας δωματίων",
         "room_list_navigate_down": "Πλοήγηση προς τα κάτω στη λίστα δωματίων",
         "room_list_navigate_up": "Πλοήγηση προς τα πάνω στη λίστα δωματίων",
         "room_list_select_room": "Επιλέξτε δωμάτιο από τη λίστα δωματίων",
-        "scroll_down_timeline": "Κύλιση προς τα κάτω στη γραμμή χρόνου",
-        "scroll_up_timeline": "Κύλιση προς τα πάνω στη γραμμή χρόνου",
+        "scroll_down_timeline": "Κύλιση προς τα κάτω στο χρονολόγιο",
+        "scroll_up_timeline": "Κύλιση προς τα πάνω στο χρονολόγιο",
         "search": "Αναζήτηση (πρέπει να είναι ενεργοποιημένη)",
         "send_sticker": "Αποστολή αυτοκόλλητου",
         "shift": "Shift",
@@ -1246,9 +1217,9 @@
         "video_rooms_a_new_way_to_chat": "Ένας νέος τρόπος για συνομιλία μέσω φωνής και βίντεο με το %(brand)s.",
         "video_rooms_always_on_voip_channels": "Οι αίθουσες βίντεο είναι πάντα-ενεργά κανάλια VoIP ενσωματωμένα σε ένα δωμάτιο στο %(brand)s",
         "video_rooms_beta": "Οι αίθουσες βίντεο είναι μια λειτουργία beta",
-        "video_rooms_faq1_answer": "Χρησιμοποιήστε το κουμπί “+” στην ενότητα δωματίων του αριστερού πάνελ.",
+        "video_rooms_faq1_answer": "Χρησιμοποιήστε το κουμπί “+” στην ενότητα αιθουσών του αριστερού πάνελ.",
         "video_rooms_faq1_question": "Πώς μπορώ να δημιουργήσω ένα δωμάτιο βίντεο;",
-        "video_rooms_faq2_answer": "Ναι, το χρονοδιάγραμμα της συνομιλίας εμφανίζεται δίπλα στο βίντεο.",
+        "video_rooms_faq2_answer": "Ναι, το χρονολόγιο της συνομιλίας εμφανίζεται δίπλα στο βίντεο.",
         "video_rooms_faq2_question": "Μπορώ να χρησιμοποιήσω τη συνομιλία κειμένου παράλληλα με τη βιντεοκλήση;",
         "wysiwyg_composer": "Συντάκτης εμπλουτισμένου κειμένου"
     },
@@ -1267,7 +1238,7 @@
         "lists_description_1": "Η εγγραφή σε μια λίστα απαγορεύσων θα σας κάνει να εγγραφείτε σε αυτήν!",
         "lists_description_2": "Εάν αυτό δεν είναι αυτό που θέλετε, χρησιμοποιήστε ένα διαφορετικό εργαλείο για να αγνοήσετε τους χρήστες.",
         "lists_heading": "Εγγεγραμμένες λίστες",
-        "lists_new_label": "Ταυτότητα δωματίου ή διεύθυνση της λίστας απαγορευσων",
+        "lists_new_label": "Ταυτότητα αίθουσας ή διεύθυνση της λίστας απαγορεύσεων",
         "no_lists": "Δεν είστε εγγεγραμμένοι σε καμία λίστα",
         "personal_empty": "Δεν έχετε αγνοήσει κανέναν.",
         "personal_heading": "Προσωπική λίστα απαγορεύσεων",
@@ -1452,11 +1423,6 @@
         "ongoing": "Αφαίρεση…",
         "reason_label": "Αιτία (προαιρετικό)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Είστε σίγουροι ότι θέλετε να απορρίψετε την πρόσκληση;",
-        "failed": "Δεν ήταν δυνατή η απόρριψη της πρόσκλησης",
-        "title": "Απόρριψη πρόσκλησης"
-    },
     "report_content": {
         "description": "Η αναφορά αυτού του μηνύματος θα στείλει το μοναδικό «αναγνωριστικό συμβάντος» στον διαχειριστή του διακομιστή σας. Εάν τα μηνύματα σε αυτό το δωμάτιο είναι κρυπτογραφημένα, ο διαχειριστής του διακομιστή σας δε θα μπορεί να διαβάσει το κείμενο του μηνύματος ή να προβάλει αρχεία και εικόνες.",
         "disagree": "Διαφωνώ",
@@ -1501,14 +1467,16 @@
         "pinned_messages": {
             "limits": {
                 "other": "Μπορείτε να καρφιτσώσετε μόνο έως %(count)s μικρεοεφαρμογές"
-            }
+            },
+            "view": "Εμφάνιση στο χρονολόγιο"
         },
         "pinned_messages_button": "Καρφιτσωμένο",
         "poll": {
             "final_result": {
                 "one": "Τελικό αποτέλεσμα με βάση %(count)s ψήφο",
                 "other": "Τελικό αποτέλεσμα με βάση %(count)s ψήφους"
-            }
+            },
+            "view_in_timeline": "Εμφάνιση δημοσκόπισης στο χρονολόγιο"
         },
         "thread_list": {
             "context_menu_label": "Επιλογές νήματος συζήτησης"
@@ -1567,13 +1535,13 @@
         "inaccessible": "Αυτό το δωμάτιο ή ο χώρος δεν είναι προσβάσιμος αυτήν τη στιγμή.",
         "inaccessible_name": "Το %(roomName)s δεν είναι προσβάσιμο αυτή τη στιγμή.",
         "inaccessible_subtitle_1": "Δοκιμάστε ξανά αργότερα ή ζητήστε από έναν διαχειριστή δωματίου ή χώρου να ελέγξει εάν έχετε πρόσβαση.",
-        "inaccessible_subtitle_2": "Το %(errcode)s επιστράφηκε κατά την προσπάθεια πρόσβασης στο δωμάτιο ή στο χώρο. Εάν πιστεύετε ότι βλέπετε αυτό το μήνυμα κατά λάθος, <issueLink>υποβάλετε μια αναφορά σφάλματος</issueLink>.",
+        "inaccessible_subtitle_2": "Το %(errcode)s επιστράφηκε κατά την προσπάθεια πρόσβασης στην αίθουσα ή στο χώρο. Εάν πιστεύετε ότι βλέπετε αυτό το μήνυμα κατά λάθος, <issueLink>υποβάλετε μια αναφορά σφάλματος</issueLink>.",
         "intro": {
             "dm_caption": "Μόνο οι δυο σας συμμετέχετε σε αυτήν τη συνομιλία, εκτός εάν κάποιος από εσάς προσκαλέσει κάποιον να συμμετάσχει.",
             "enable_encryption_prompt": "Ενεργοποιήστε την κρυπτογράφηση στις ρυθμίσεις.",
             "no_avatar_label": "Προσθέστε μια φωτογραφία, ώστε οι χρήστες να μπορούν εύκολα να εντοπίσουν το δωμάτιό σας.",
             "no_topic": "<a>Προσθέστε ένα θέμα</a> για να βοηθήσετε τους χρήστες να γνωρίζουν περί τίνος πρόκειται.",
-            "private_unencrypted_warning": "Τα προσωπικά σας μηνύματα είναι συνήθως κρυπτογραφημένα, αλλά αυτό το δωμάτιο δεν είναι. Συνήθως αυτό οφείλεται σε μια μη υποστηριζόμενη συσκευή ή μέθοδο που χρησιμοποιείται, όπως προσκλήσεις μέσω email.",
+            "private_unencrypted_warning": "Τα προσωπικά σας μηνύματα είναι συνήθως κρυπτογραφημένα, αλλά αυτή η αίθουσα δεν είναι. Συνήθως αυτό οφείλεται σε μια μη υποστηριζόμενη συσκευή ή μέθοδο που χρησιμοποιείται, όπως προσκλήσεις μέσω email.",
             "room_invite": "Προσκαλέστε μόνο σε αυτό το δωμάτιο",
             "start_of_dm_history": "Αυτή είναι η αρχή του ιστορικού των άμεσων μηνυμάτων σας με <displayName/>.",
             "start_of_room": "Αυτή είναι η αρχή του <roomName/>.",
@@ -1584,7 +1552,6 @@
             "you_created": "Δημιουργήσατε αυτό το δωμάτιο."
         },
         "invite_email_mismatch_suggestion": "Μοιραστείτε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου στις Ρυθμίσεις για να λαμβάνετε προσκλήσεις απευθείας σε %(brand)s.",
-        "invite_reject_ignore": "Απόρριψη & Παράβλεψη χρήστη",
         "invite_sent_to_email": "Αυτή η πρόσκληση στάλθηκε στο %(email)s",
         "invite_sent_to_email_room": "Αυτή η πρόσκληση στο %(roomName)s στάλθηκε στο %(email)s",
         "invite_subtitle": "Ο <userName/> σας προσκάλεσε",
@@ -1605,7 +1572,7 @@
         "kick_reason": "Αιτία: %(reason)s",
         "kicked_by": "Αφαιρεθήκατε από %(memberName)s",
         "kicked_from_room_by": "Αφαιρεθήκατε από το %(roomName)s από τον %(memberName)s",
-        "leave_error_title": "Σφάλμα στην έξοδο από το δωμάτιο",
+        "leave_error_title": "Σφάλμα κατά την έξοδο από την αίθουσα",
         "leave_server_notices_description": "Αυτό το δωμάτιο χρησιμοποιείται για σημαντικά μηνύματα από τον κεντρικό διακομιστή, επομένως δεν μπορείτε να το αφήσετε.",
         "leave_server_notices_title": "Δεν είναι δυνατή η έξοδος από την αίθουσα ειδοποιήσεων διακομιστή",
         "leave_unexpected_error": "Μη αναμενόμενο σφάλμα διακομιστή κατά την προσπάθεια εξόδου από το δωμάτιο",
@@ -1617,6 +1584,9 @@
         "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": "Διαγραφή όλων",
@@ -1634,7 +1604,7 @@
             "other": "Έχετε %(count)s μη αναγνωσμένες ειδοποιήσεις σε προηγούμενη έκδοση αυτού του δωματίου."
         },
         "upgrade_error_description": "Επανελέγξτε ότι ο διακομιστής σας υποστηρίζει την έκδοση δωματίου που επιλέξατε και προσπαθήστε ξανά.",
-        "upgrade_error_title": "Σφάλμα αναβάθμισης δωματίου",
+        "upgrade_error_title": "Σφάλμα αναβάθμισης αίθουσας",
         "upgrade_warning_bar": "Η αναβάθμιση αυτού του δωματίου θα τερματίσει το δωμάτιο και θα δημιουργήσει ένα αναβαθμισμένο δωμάτιο με το ίδιο όνομα.",
         "upgrade_warning_bar_admins": "Μόνο οι διαχειριστές δωματίων θα βλέπουν αυτήν την προειδοποίηση",
         "upgrade_warning_bar_unstable": "Αυτό το δωμάτιο τρέχει την έκδοση <roomVersion />, την οποία ο κεντρικός διακομιστής έχει επισημάνει ως <i>ασταθής</i>.",
@@ -1753,7 +1723,7 @@
             "local_aliases_explainer_room": "Ορίστε διευθύνσεις για αυτό το δωμάτιο, ώστε οι χρήστες να μπορούν να το βρίσκουν μέσω του κεντρικού σας διακομιστή (%(localDomain)s)",
             "local_aliases_explainer_space": "Ορίστε διευθύνσεις για αυτόν τον χώρο, ώστε οι χρήστες να μπορούν να τον βρίσκουν μέσω του κεντρικού σας διακομιστή (%(localDomain)s)",
             "local_aliases_section": "Τοπική Διεύθυνση",
-            "name_field_label": "Όνομα Δωματίου",
+            "name_field_label": "Όνομα Αίθουσας",
             "new_alias_placeholder": "Νέα δημοσιευμένη διεύθυνση (π.χ. #alias:server)",
             "no_aliases_room": "Αυτό το δωμάτιο δεν έχει τοπικές διευθύνσεις",
             "no_aliases_space": "Αυτός ο χώρος δεν έχει τοπικές διευθύνσεις",
@@ -1836,7 +1806,7 @@
             "encryption_permanent": "Αφού ενεργοποιηθεί, η κρυπτογράφηση δεν μπορεί να απενεργοποιηθεί.",
             "error_join_rule_change_title": "Αποτυχία ενημέρωσης των κανόνων συμμετοχής",
             "error_join_rule_change_unknown": "Άγνωστο σφάλμα",
-            "guest_access_warning": "Τα άτομα με υποστηριζόμενους πελάτες θα μπορούν να εγγραφούν στο δωμάτιο χωρίς να έχουν εγγεγραμμένο λογαριασμό.",
+            "guest_access_warning": "Τα άτομα με υποστηριζόμενες εφαρμογές θα μπορούν να συμμετάσχουν στην αίθουσα χωρίς να έχουν εγγεγραμμένο λογαριασμό.",
             "history_visibility_invited": "Μόνο μέλη (από τη στιγμή που προσκλήθηκαν)",
             "history_visibility_joined": "Μόνο μέλη (από τη στιγμή που έγιναν μέλη)",
             "history_visibility_legend": "Ποιος μπορεί να διαβάσει το ιστορικό;",
@@ -1856,7 +1826,7 @@
             "join_rule_restricted_dialog_empty_warning": "Καταργείτε όλους τους χώρους. Η πρόσβαση θα είναι προεπιλεγμένη μόνο για πρόσκληση",
             "join_rule_restricted_dialog_filter_placeholder": "Αναζήτηση χώρων",
             "join_rule_restricted_dialog_heading_other": "Άλλοι χώροι ή δωμάτια που ίσως δε γνωρίζετε",
-            "join_rule_restricted_dialog_heading_room": "Χώροι που γνωρίζετε ότι περιέχουν αυτό το δωμάτιο",
+            "join_rule_restricted_dialog_heading_room": "Χώροι που γνωρίζετε ότι περιέχουν αυτήν την αίθουσα",
             "join_rule_restricted_dialog_heading_space": "Χώροι που γνωρίζετε ότι περιέχουν αυτόν το χώρο",
             "join_rule_restricted_dialog_heading_unknown": "Πιθανότατα αυτά είναι μέρος στα οποία συμμετέχουν και άλλοι διαχειριστές δωματίου.",
             "join_rule_restricted_dialog_title": "Επιλέξτε χώρους",
@@ -1870,7 +1840,7 @@
             },
             "join_rule_restricted_upgrade_description": "Αυτή η αναβάθμιση θα επιτρέψει σε μέλη επιλεγμένων Χώρων πρόσβαση σε αυτό το δωμάτιο χωρίς πρόσκληση.",
             "join_rule_restricted_upgrade_warning": "Αυτό το δωμάτιο βρίσκεται σε ορισμένους Χώρους στους οποίους δεν είστε διαχειριστής. Σε αυτούς τους Χώρους, το παλιό δωμάτιο θα εξακολουθεί να εμφανίζεται, αλλά τα άτομα θα κληθούν να συμμετάσχουν στο νέο.",
-            "join_rule_upgrade_awaiting_room": "Φόρτωση νέου δωματίου",
+            "join_rule_upgrade_awaiting_room": "Φόρτωση νέας αίθουσας",
             "join_rule_upgrade_required": "Απαιτείται αναβάθμιση",
             "join_rule_upgrade_sending_invites": {
                 "one": "Αποστολή πρόσκλησης...",
@@ -1910,7 +1880,7 @@
         "error_missing_user_id_request": "Λείπει το user_id στο αίτημα",
         "error_permission": "Δεν έχετε την άδεια να το κάνετε αυτό σε αυτό το δωμάτιο.",
         "error_power_level_invalid": "Το επίπεδο δύναμης πρέπει να είναι ένας θετικός ακέραιος.",
-        "error_room_not_visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
+        "error_room_not_visible": "Η αίθουσα %(roomId)s δεν είναι ορατή",
         "error_room_unknown": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
         "error_send_request": "Δεν ήταν δυνατή η αποστολή αιτήματος."
     },
@@ -1951,7 +1921,7 @@
     },
     "settings": {
         "all_rooms_home": "Εμφάνιση όλων των δωματίων στην Αρχική",
-        "all_rooms_home_description": "Όλα τα δωμάτια στα οποία συμμετέχετε θα εμφανίζονται στην Αρχική σελίδα.",
+        "all_rooms_home_description": "Όλες οι αίθουσες στις οποίες συμμετέχετε θα εμφανίζονται στην Αρχική σελίδα.",
         "always_show_message_timestamps": "Εμφάνιση πάντα της ένδειξης ώρας στα μηνύματα",
         "appearance": {
             "custom_font": "Χρήση μιας γραμματοσειρά συστήματος",
@@ -1966,7 +1936,7 @@
             "layout_bubbles": "Συννεφάκια μηνυμάτων",
             "layout_irc": "IRC (Πειραματικό)",
             "match_system_theme": "Αντιστοίχιση θέματος συστήματος",
-            "timeline_image_size": "Μέγεθος εικόνας στη γραμμή χρόνου"
+            "timeline_image_size": "Μέγεθος εικόνας στο χρονολόγιο"
         },
         "automatic_language_detection_syntax_highlight": "Ενεργοποίηση αυτόματης ανίχνευσης γλώσσας για επισήμανση σύνταξης",
         "autoplay_gifs": "Αυτόματη αναπαραγωγή GIFs",
@@ -2000,7 +1970,7 @@
             "deactivate_confirm_content_3": "Κανείς δε θα μπορεί να επαναχρησιμοποιήσει το όνομα χρήστη σας (MXID), συμπεριλαμβανομένου εσάς: αυτό το όνομα χρήστη θα παραμείνει μη διαθέσιμο",
             "deactivate_confirm_content_4": "Θα αποχωρήσετε από όλα τα δωμάτια και τις συνομιλίες σας",
             "deactivate_confirm_content_5": "Θα αφαιρεθείς από τον διακομιστή ταυτότητας: οι φίλοι σου δεν θα μπορούν πλέον να σε βρίσκουν με το email ή τον αριθμό τηλεφώνου σου",
-            "deactivate_confirm_content_6": "Τα παλιά σου μηνύματα θα εξακολουθούν να είναι ορατά σε άτομα που τα έλαβαν, όπως τα email που έστειλες στο παρελθόν. Θα 'θελες να αποκρύψεις τα απεσταλμένα σου μηνύματα από άτομα που συμμετέχουν στα δωμάτια στο μέλλον;",
+            "deactivate_confirm_content_6": "Τα παλιά σας μηνύματα θα εξακολουθούν να είναι ορατά σε άτομα που τα έλαβαν, όπως τα email που στείλατε στο παρελθόν. Θα θέλατε να αποκρύψετε τα απεσταλμένα σας μηνύματα από άτομα που συμμετέχουν στις αίθουσες στο μέλλον;",
             "deactivate_confirm_continue": "Επιβεβαίωση απενεργοποίησης λογαριασμού",
             "deactivate_confirm_erase_label": "Απόκρυψη των μηνυμάτων μου από νέους συμμετέχοντες",
             "deactivate_section": "Απενεργοποίηση λογαριασμού",
@@ -2046,12 +2016,11 @@
             "remove_msisdn_prompt": "Κατάργηση %(phone)s;",
             "spell_check_locale_placeholder": "Επιλογή τοπικών ρυθμίσεων"
         },
-        "image_thumbnails": "Εμφάνιση προεπισκοπήσεων/μικρογραφιών για εικόνες",
         "inline_url_previews_default": "Ενεργοποιήστε τις ενσωματωμένες προεπισκοπήσεις URL από προεπιλογή",
         "inline_url_previews_room": "Ενεργοποιήστε τις προεπισκοπήσεις URL από προεπιλογή για τους συμμετέχοντες σε αυτό το δωμάτιο",
         "inline_url_previews_room_account": "Ενεργοποίηση προεπισκόπισης URL για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
         "insert_trailing_colon_mentions": "Εισαγάγετε άνω και κάτω τελεία μετά την αναφορά του χρήστη στην αρχή ενός μηνύματος",
-        "jump_to_bottom_on_send": "Μεταβείτε στο τέλος του χρονοδιαγράμματος όταν στέλνετε ένα μήνυμα",
+        "jump_to_bottom_on_send": "Μεταβείτε στο τέλος του χρονολογίου όταν στέλνετε ένα μήνυμα",
         "key_backup": {
             "backup_in_progress": "Δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας (το πρώτο αντίγραφο ασφαλείας μπορεί να διαρκέσει μερικά λεπτά).",
             "backup_success": "Επιτυχία!",
@@ -2095,6 +2064,9 @@
         "keyboard": {
             "title": "Πληκτρολόγιο"
         },
+        "media_preview": {
+            "media_preview_label": "Εμφάνιση μέσων στο χρονολόγιο"
+        },
         "notifications": {
             "default_setting_description": "Αυτή η ρύθμιση θα εφαρμοστεί από προεπιλογή σε όλα τα δωμάτιά σου.",
             "default_setting_section": "Θέλω να ειδοποιούμαι για (Προεπιλεγμένη Ρύθμιση)",
@@ -2141,12 +2113,12 @@
             "rule_contains_user_name": "Μηνύματα που περιέχουν το όνομα χρήστη μου",
             "rule_encrypted": "Κρυπτογραφημένα μηνύματα σε ομαδικές συνομιλίες",
             "rule_encrypted_room_one_to_one": "Κρυπτογραφημένα μηνύματα σε συνομιλίες ένας προς έναν",
-            "rule_invite_for_me": "Όταν με προσκαλούν σ' ένα δωμάτιο",
+            "rule_invite_for_me": "Όταν με προσκαλούν σε μία αίθουσα",
             "rule_message": "Μηνύματα σε ομαδικές συνομιλίες",
             "rule_room_one_to_one": "Μηνύματα σε 1-προς-1 συνομιλίες",
             "rule_roomnotif": "Μηνύματα που περιέχουν @δωμάτιο",
             "rule_suppress_notices": "Μηνύματα από bots",
-            "rule_tombstone": "Όταν τα δωμάτια αναβαθμίζονται",
+            "rule_tombstone": "Όταν οι αίθουσες αναβαθμίζονται",
             "show_message_desktop_notification": "Εμφάνιση του μηνύματος στην ειδοποίηση στον υπολογιστή",
             "voip": "Κλήσεις ήχου και Βίντεο"
         },
@@ -2175,53 +2147,16 @@
         "prompt_invite": "Ερώτηση πριν από την αποστολή προσκλήσεων σε δυνητικά μη έγκυρα αναγνωριστικά matrix",
         "replace_plain_emoji": "Αυτόματη αντικατάσταση απλού κειμένου Emoji",
         "security": {
-            "4s_public_key_in_account_data": "στα δεδομένα λογαριασμού",
-            "4s_public_key_status": "Δημόσιο κλειδί μυστικής αποθήκευσης:",
-            "backup_key_cached_status": "Αποθηκευμένο εφεδρικό κλειδί στην κρυφή μνήμη:",
-            "backup_key_stored_status": "Αποθηκευμένο εφεδρικό κλειδί:",
-            "backup_key_unexpected_type": "μη αναμενόμενος τύπος",
-            "backup_key_well_formed": "καλοσχηματισμένο",
-            "backup_keys_description": "Δημιουργήστε αντίγραφα ασφαλείας των κλειδιών κρυπτογράφησης με τα δεδομένα του λογαριασμού σας σε περίπτωση που χάσετε την πρόσβαση στις συνεδρίες σας. Τα κλειδιά σας θα ασφαλιστούν με ένα μοναδικό κλειδί ασφαλείας.",
             "bulk_options_accept_all_invites": "Αποδεχτείτε όλες τις %(invitedRooms)sπροσκλήσεις",
             "bulk_options_reject_all_invites": "Απόρριψη όλων των προσκλήσεων %(invitedRooms)s",
             "bulk_options_section": "Μαζικές επιλογές",
-            "cross_signing_cached": "αποθηκευμένο τοπικά",
-            "cross_signing_homeserver_support": "Υποστήριξη λειτουργιών κεντρικού διακομιστή:",
-            "cross_signing_homeserver_support_exists": "υπάρχει",
-            "cross_signing_in_4s": "σε μυστική αποθήκευση",
-            "cross_signing_in_memory": "στη μνήμη",
-            "cross_signing_master_private_Key": "Κύριο ιδιωτικό κλειδί:",
-            "cross_signing_not_cached": "δεν βρέθηκε τοπικά",
-            "cross_signing_not_found": "δε βρέθηκε",
-            "cross_signing_not_in_4s": "δεν βρέθηκε στην αποθήκευση",
-            "cross_signing_not_stored": "μη αποθηκευμένο",
-            "cross_signing_private_keys": "Διασταυρούμενη υπογραφή ιδιωτικών κλειδιών:",
-            "cross_signing_public_keys": "Διασταυρούμενη υπογραφή δημόσιων κλειδιών:",
-            "cross_signing_self_signing_private_key": "Αυτόματη υπογραφή ιδιωτικού κλειδιού:",
-            "cross_signing_user_signing_private_key": "Ιδιωτικό κλειδί για υπογραφή χρήστη:",
-            "cryptography_section": "Κρυπτογραφία",
-            "delete_backup": "Διαγραφή Αντιγράφου ασφαλείας",
-            "delete_backup_confirm_description": "Είσαι σίγουρος? Θα χάσετε τα κρυπτογραφημένα μηνύματά σας εάν δε δημιουργηθούν σωστά αντίγραφα ασφαλείας των κλειδιών σας.",
             "e2ee_default_disabled_warning": "Ο διαχειριστής του διακομιστή σας έχει απενεργοποιήσει την κρυπτογράφηση από άκρο σε άκρο από προεπιλογή σε ιδιωτικά δωμάτια & άμεσα μηνύματα.",
             "enable_message_search": "Ενεργοποίηση αναζήτησης μηνυμάτων σε κρυπτογραφημένα δωμάτια",
             "encryption_section": "Κρυπτογράφηση",
-            "error_loading_key_backup_status": "Δεν είναι δυνατή η φόρτωση της κατάστασης του αντιγράφου ασφαλείας κλειδιού",
-            "export_megolm_keys": "Εξαγωγή κλειδιών κρυπτογράφησης για το δωμάτιο",
             "ignore_users_empty": "Δεν έχετε χρήστες που έχετε αγνοήσει.",
             "ignore_users_section": "Χρήστες που αγνοήθηκαν",
-            "import_megolm_keys": "Εισαγωγή κλειδιών E2E",
-            "key_backup_active": "Αυτή η συνεδρία δημιουργεί αντίγραφα ασφαλείας των κλειδιών σου.",
-            "key_backup_active_version": "Ενεργή έκδοση αντιγράφων ασφαλείας:",
-            "key_backup_active_version_none": "Κανένα",
             "key_backup_algorithm": "Αλγόριθμος:",
-            "key_backup_can_be_restored": "Αυτό το αντίγραφο ασφαλείας μπορεί να επαναφερθεί σε αυτήν την περίοδο λειτουργίας",
-            "key_backup_complete": "Δημιουργήθηκαν αντίγραφα ασφαλείας όλων των κλειδιών",
             "key_backup_connect": "Συνδέστε αυτήν την συνεδρία με το αντίγραφο ασφαλείας κλειδιού",
-            "key_backup_connect_prompt": "Συνδέστε αυτήν την συνεδρία με το αντίγραφο ασφαλείας κλειδιού πριν αποσυνδεθείτε για να αποφύγετε την απώλεια κλειδιών που μπορεί να υπάρχουν μόνο σε αυτήν την συνεδρία.",
-            "key_backup_in_progress": "Δημιουργία αντιγράφων %(sessionsRemaining)s κλειδιών...",
-            "key_backup_inactive": "Αυτή η συνεδρία <b>δεν δημιουργεί αντίγραφα ασφαλείας των κλειδιών σας</b>, αλλά έχετε ένα υπάρχον αντίγραφο ασφαλείας από το οποίο μπορείτε να επαναφέρετε και να προσθέσετε στη συνέχεια.",
-            "key_backup_inactive_warning": "<b>Δεν δημιουργούνται αντίγραφα ασφαλείας των κλειδιών σας από αυτήν την συνεδρία</b>.",
-            "key_backup_latest_version": "Τελευταία έκδοση αντιγράφων ασφαλείας στο διακομιστή:",
             "message_search_disable_warning": "Εάν απενεργοποιηθεί, τα μηνύματα από κρυπτογραφημένα δωμάτια δε θα εμφανίζονται στα αποτελέσματα αναζήτησης.",
             "message_search_disabled": "Αποθηκεύστε με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά για να εμφανίζονται στα αποτελέσματα αναζήτησης.",
             "message_search_enabled": {
@@ -2241,13 +2176,7 @@
             "message_search_unsupported": "Λείπουν ορισμένα στοιχεία από το %(brand)s που απαιτούνται για την ασφαλή αποθήκευση κρυπτογραφημένων μηνυμάτων τοπικά. Εάν θέλετε να πειραματιστείτε με αυτό το χαρακτηριστικό, δημιουργήστε μια προσαρμοσμένη %(brand)s επιφάνεια εργασίαςμε <nativeLink>προσθήκη στοιχείων αναζήτησης</nativeLink>.",
             "message_search_unsupported_web": "Το %(brand)s δεν μπορεί να αποθηκεύσει με ασφάλεια κρυπτογραφημένα μηνύματα τοπικά ενώ εκτελείται σε πρόγραμμα περιήγησης ιστού. Χρησιμοποιήστε την <desktopLink>%(brand)s Επιφάνεια εργασίας</desktopLink> για να εμφανίζονται κρυπτογραφημένα μηνύματα στα αποτελέσματα αναζήτησης.",
             "record_session_details": "Κατέγραψε το όνομα του πελάτη, την έκδοση και τη διεύθυνση URL για να αναγνωρίζεις τις συνεδρίες πιο εύκολα στον διαχειριστή συνεδρίας",
-            "restore_key_backup": "Επαναφορά από Αντίγραφο ασφαλείας",
-            "secret_storage_not_ready": "δεν είναι έτοιμο",
-            "secret_storage_ready": "έτοιμο",
-            "secret_storage_status": "Μυστική αποθήκευση:",
             "send_analytics": "Αποστολή δεδομένων αναλυτικών στοιχείων",
-            "session_id": "Αναγνωριστικό συνεδρίας:",
-            "session_key": "Κλειδί συνεδρίας:",
             "strict_encryption": "Μη στέλνετε ποτέ κρυπτογραφημένα μηνύματα σε μη επαληθευμένες συνεδρίες από αυτήν τη συνεδρία"
         },
         "send_read_receipts": "Αποστολή αποδείξεων ανάγνωσης",
@@ -2297,9 +2226,9 @@
         "start_automatically": "Αυτόματη έναρξη μετά τη σύνδεση",
         "use_12_hour_format": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
         "use_command_enter_send_message": "Χρησιμοποιήστε Command + Enter για να στείλετε ένα μήνυμα",
-        "use_command_f_search": "Χρησιμοποιήστε το Command + F για αναζήτηση στο χρονοδιάγραμμα",
+        "use_command_f_search": "Χρησιμοποιήστε τα πλήκτρα Command + F για αναζήτηση στο χρονολόγιο",
         "use_control_enter_send_message": "Χρησιμοποιήστε Ctrl + Enter για να στείλετε ένα μήνυμα",
-        "use_control_f_search": "Χρησιμοποιήστε τα πλήκτρα Ctrl + F για αναζήτηση στο χρονοδιάγραμμα",
+        "use_control_f_search": "Χρησιμοποιήστε τα πλήκτρα Ctrl + F για αναζήτηση στο χρονολόγιο",
         "voip": {
             "allow_p2p": "Να επιτρέπεται η χρήση Peer-to-Peer για κλήσεις 1:1",
             "allow_p2p_description": "Όταν είναι ενεργό, το άλλο άτομο ενδέχεται να μπορεί να δει τη διεύθυνση IP σου",
@@ -2362,8 +2291,8 @@
         "invite_3pid_needs_is_error": "Χρησιμοποιήστε έναν διακομιστή ταυτοτήτων για να προσκαλέσετε μέσω email. Μπορείτε να κάνετε διαχείριση στις Ρυθμίσεις.",
         "invite_3pid_use_default_is_title": "Χρησιμοποιήστε ένα διακομιστή ταυτοτήτων",
         "invite_3pid_use_default_is_title_description": "Χρησιμοποιήστε έναν διακομιστή ταυτοτήτων για να προσκαλέσετε μέσω email. Πατήστε συνέχεια για να χρησιμοποιήσετε τον προεπιλεγμένο διακομιστή ταυτοτήτων (%(defaultIdentityServerName)s) ή μπείτε στην διαχείριση στις Ρυθμίσεις.",
-        "join": "Σύνδεση στο δωμάτιο με την δοθείσα διεύθυνση",
-        "jumptodate": "Μεταβείτε στη δεδομένη ημερομηνία στη γραμμή χρόνου",
+        "join": "Σύνδεση στην αίθουσα με την δοθείσα διεύθυνση",
+        "jumptodate": "Μεταβείτε στη δεδομένη ημερομηνία στο χρονολόγιο",
         "jumptodate_invalid_input": "Αδυναμία κατανόησης της δοθείσας ημερομηνίας (%(inputDate)s). Προσπαθήστε να χρησιμοποιήσετε την μορφή YYYY-MM-DD.",
         "lenny": "Προ-εισάγει ( ͡° ͜ʖ ͡°) σε ένα μήνυμα απλού κειμένου",
         "me": "Εμφανίζει την ενέργεια",
@@ -2390,10 +2319,8 @@
         "spoiler": "Στέλνει το δοθέν μήνυμα ως spoiler",
         "tableflip": "Προ-εισάγει (╯°□°）╯︵ ┻━┻ σε ένα μήνυμα απλού κειμένου",
         "topic": "Λαμβάνει ή θέτει το θέμα του δωματίου",
-        "topic_none": "Το δωμάτιο αυτό δεν έχει κανένα θέμα.",
+        "topic_none": "Αυτή η αίθουσα δεν έχει κάποιο θέμα.",
         "topic_room_error": "Αποτυχία λήψης θέματος δωματίου: Αδυναμία εύρεσης δωματίου (%(roomId)s",
-        "tovirtual": "Μεταβαίνει στο εικονικό δωμάτιο αυτού του δωματίου, εάν υπάρχει",
-        "tovirtual_not_found": "Δεν υπάρχει εικονικό δωμάτιο για αυτό το δωμάτιο",
         "unban": "Άρση αποκλεισμού χρήστη με το συγκεκριμένο αναγνωριστικό",
         "unflip": "Προ-εισάγει ┬──┬ ノ( ゜-゜ノ) σε ένα μήνυμα απλού κειμένου",
         "unholdcall": "Επαναφέρει την κλήση στο τρέχον δωμάτιο από την αναμονή",
@@ -2431,7 +2358,7 @@
             "space_dropdown_title": "Προσθήκη υπάρχοντος χώρου"
         },
         "context_menu": {
-            "devtools_open_timeline": "Εμφάνιση χρονοδιαγράμματος δωματίου (develtools)",
+            "devtools_open_timeline": "Εμφάνιση χρονολογίου αίθουσας (develtools)",
             "explore": "Εξερευνήστε δωμάτια",
             "home": "Αρχική σελίδα χώρου",
             "manage_and_explore": "Διαχειριστείτε και εξερευνήστε δωμάτια",
@@ -2508,7 +2435,6 @@
         "heading_without_query": "Αναζήτηση για",
         "join_button_text": "Συμμετοχή στο %(roomAddress)s",
         "keyboard_scroll_hint": "Χρησιμοποιήστε τα <arrows/> για κύλιση",
-        "message_search_section_title": "'Άλλες αναζητήσεις",
         "other_rooms_in_space": "Άλλα δωμάτιο στο %(spaceName)s",
         "public_rooms_label": "Δημόσια δωμάτια",
         "recent_searches_section_title": "Πρόσφατες αναζητήσεις",
@@ -2516,7 +2442,6 @@
         "result_may_be_hidden_privacy_warning": "Ορισμένα αποτελέσματα ενδέχεται να είναι κρυφά για λόγους απορρήτου",
         "result_may_be_hidden_warning": "Ορισμένα αποτελέσματα ενδέχεται να είναι κρυμμένα",
         "search_dialog": "Παράθυρο Αναζήτησης",
-        "search_messages_hint": "Για να αναζητήσετε μηνύματα, βρείτε αυτό το εικονίδιο στην κορυφή ενός δωματίου <icon/>",
         "spaces_title": "Χώροι που ανήκετε",
         "start_group_chat_button": "Ξεκινήστε μια ομαδική συνομιλία"
     },
@@ -2611,9 +2536,9 @@
         "historical_messages_unavailable": "Δεν μπορείτε να δείτε προηγούμενα μηνύματα",
         "io.element.widgets.layout": "%(senderName)s έχει ενημερώσει τη διάταξη του δωματίου",
         "load_error": {
-            "no_permission": "Προσπαθήσατε να φορτώσετε ένα συγκεκριμένο σημείο στο χρονολόγιο του δωματίου, αλλά δεν έχετε δικαίωμα να δείτε το εν λόγω μήνυμα.",
+            "no_permission": "Έγινε προσπάθεια φόρτωσης ενός συγκεκριμένου σημείου στο χρονολόγιο της αίθουσας, αλλά δεν έχετε δικαίωμα να δείτε το εν λόγω μήνυμα.",
             "title": "Δεν ήταν δυνατή η φόρτωση της θέσης του χρονολόγιου",
-            "unable_to_find": "Προσπαθήσατε να φορτώσετε ένα συγκεκριμένο σημείο στο χρονολόγιο του δωματίου, αλλά δεν καταφέρατε να το βρείτε."
+            "unable_to_find": "Έγινε προσπάθεια φόρτωσης ενός συγκεκριμένου σημείου στο χρονολόγιο της αίθουσας, αλλά δε βρέθηκε."
         },
         "m.audio": {
             "error_downloading_audio": "Σφάλμα λήψης ήχου",
@@ -2765,7 +2690,7 @@
             "user_from_to": "%(userId)s από %(fromPowerLevel)s σε %(toPowerLevel)s"
         },
         "m.room.server_acl": {
-            "all_servers_banned": "🎉 Όλοι οι διακομιστές αποκλείστηκαν από την συμμετοχή! Αυτό το δωμάτιο δεν μπορεί να χρησιμοποιηθεί πλέον.",
+            "all_servers_banned": "🎉 Όλοι οι διακομιστές αποκλείστηκαν από την συμμετοχή! Αυτή η αίθουσα δεν μπορεί να χρησιμοποιηθεί πλέον.",
             "changed": "Ο %(senderDisplayName)s άλλαξε τα ACLs του διακομιστή για αυτό το δωμάτιο.",
             "set": "Ο %(senderDisplayName)s όρισε τα ACLs του διακομιστή για αυτό το δωμάτιο."
         },
@@ -2785,7 +2710,7 @@
             "added": "Προστέθηκε η μικροεφαρμογή %(widgetName)s από τον/την %(senderName)s",
             "jitsi_ended": "Η τηλεδιάσκεψη τερματίστηκε από %(senderName)s",
             "jitsi_join_right_prompt": "Συμμετάσχετε στην τηλεδιάσκεψη από την κάρτα πληροφοριών στα δεξιά",
-            "jitsi_join_top_prompt": "Συμμετάσχετε στην τηλεδιάσκεψη από την κορυφή του δωματίου αυτού",
+            "jitsi_join_top_prompt": "Συμμετάσχετε στην τηλεδιάσκεψη από την κορυφή αυτής της αίθουσας",
             "jitsi_started": "Η τηλεδιάσκεψη ξεκίνησε από %(senderName)s",
             "jitsi_updated": "Η τηλεδιάσκεψη ενημερώθηκε από %(senderName)s",
             "modified": "Έγινε αλλαγή στη μικροεφαρμογή %(widgetName)s από τον/την %(senderName)s",
@@ -3079,14 +3004,14 @@
             "confirm_keep_state_explainer": "Καταργήστε την επιλογή εάν θέλετε επίσης να καταργήσετε τα μηνύματα συστήματος σε αυτόν τον χρήστη (π.χ. αλλαγή μέλους, αλλαγή προφίλ…)",
             "confirm_keep_state_label": "Διατήρηση μηνυμάτων συστήματος",
             "confirm_title": "Καταργήστε πρόσφατα μηνύματα από %(user)s",
-            "no_recent_messages_description": "Δοκιμάστε να κάνετε κύλιση στη γραμμή χρόνου για να δείτε αν υπάρχουν παλαιότερα.",
+            "no_recent_messages_description": "Δοκιμάστε να κάνετε κύλιση στο χρονολόγιο για να δείτε αν υπάρχουν παλαιότερα.",
             "no_recent_messages_title": "Δε βρέθηκαν πρόσφατα μηνύματα από %(user)s"
         },
         "redact_button": "Κατάργηση πρόσφατων μηνυμάτων",
         "revoke_invite": "Ανάκληση πρόσκλησης",
-        "room_encrypted": "Τα μηνύματα σε αυτό το δωμάτιο είναι κρυπτογραφημένα από άκρο σε άκρο.",
+        "room_encrypted": "Τα μηνύματα σε αυτήν την αίθουσα είναι κρυπτογραφημένα από άκρο σε άκρο.",
         "room_encrypted_detail": "Τα μηνύματά σας είναι ασφαλή και μόνο εσείς και ο παραλήπτης έχετε τα μοναδικά κλειδιά για να τα ξεκλειδώσετε.",
-        "room_unencrypted": "Τα μηνύματα σε αυτό το δωμάτιο δεν είναι κρυπτογραφημένα από άκρο σε άκρο.",
+        "room_unencrypted": "Τα μηνύματα σε αυτήν την αίθουσα δεν είναι κρυπτογραφημένα από άκρο σε άκρο.",
         "room_unencrypted_detail": "Σε κρυπτογραφημένα δωμάτια, τα μηνύματά σας είναι ασφαλή και μόνο εσείς και ο παραλήπτης έχετε τα μοναδικά κλειδιά για να τα ξεκλειδώσετε.",
         "share_button": "Κοινή χρήση Συνδέσμου με Χρήστη",
         "unban_button_space": "Αναίρεση αποκλεισμού από τον χώρο",
@@ -3192,7 +3117,7 @@
         "capability": {
             "always_on_screen_generic": "Παραμονή στην οθόνη σας ενώ τρέχετε",
             "always_on_screen_viewing_another_room": "Παραμονή στην οθόνη σας όταν βλέπετε άλλο δωμάτιο, όταν τρέχετε",
-            "any_room": "Τα παραπάνω, αλλά και σε οποιοδήποτε δωμάτιο είστε μέλος ή προσκεκλημένοι",
+            "any_room": "Τα παραπάνω, αλλά και σε οποιαδήποτε αίθουσα είστε μέλος ή προσκεκλημένοι",
             "byline_empty_state_key": "με ένα κενό κλειδί κατάστασης",
             "byline_state_key": "με κλειδί κατάστασης %(stateKey)s",
             "capability": "Η <b>%(capability)s</b> ικανότητα",
@@ -3234,22 +3159,22 @@
             "send_emotes_this_room": "Στείλτε emotes, ως εσείς, σε αυτό το δωμάτιο",
             "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_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_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": "Στείλτε βίντεο, ως εσείς, σε αυτό το δωμάτιο",
+            "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": "Αλλάξτε το δωμάτιο, το μήνυμα ή τον χρήστη που βλέπετε"
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ce1c2e503b..73566fee1b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -12,7 +12,7 @@
             "other": "%(count)s unread messages including mentions."
         },
         "recent_rooms": "Recent rooms",
-        "room_messsage_not_sent": "Open room %(roomName)s with an unset message.",
+        "room_messsage_not_sent": "Open room %(roomName)s with an unsent message.",
         "room_n_unread_invite": "Open room %(roomName)s invitation.",
         "room_n_unread_messages": {
             "one": "Open room %(roomName)s with 1 unread message.",
@@ -55,6 +55,8 @@
         "create_a_room": "Create a room",
         "create_account": "Create Account",
         "decline": "Decline",
+        "decline_and_block": "Decline and block",
+        "decline_invite": "Decline invite",
         "delete": "Delete",
         "deny": "Deny",
         "disable": "Disable",
@@ -107,7 +109,6 @@
         "react": "React",
         "refresh": "Refresh",
         "register": "Register",
-        "reject": "Reject",
         "reload": "Reload",
         "remove": "Remove",
         "rename": "Rename",
@@ -156,6 +157,7 @@
         "view_message": "View message",
         "view_source": "View Source",
         "yes": "Yes",
+        "yes_dismiss": "Yes, dismiss",
         "zoom_in": "Zoom in",
         "zoom_out": "Zoom out"
     },
@@ -383,8 +385,9 @@
             "email_resend_prompt": "Did not receive it? <a>Resend it</a>",
             "email_resent": "Resent!",
             "fallback_button": "Start authentication",
-            "mas_cross_signing_reset_cta": "Go to your account",
-            "mas_cross_signing_reset_description": "Reset your identity through your account provider and then come back and click “Retry”.",
+            "mas_cross_signing_reset_cta": "Continue to account",
+            "mas_cross_signing_reset_description": "You're about to go to your %(serverName)s account to reset your identity. Once you have completed reset on your account, please return here and click Retry.",
+            "mas_cross_signing_reset_title": "Go to your account to reset your identity",
             "msisdn": "A text message has been sent to %(msisdn)s",
             "msisdn_token_incorrect": "Token incorrect",
             "msisdn_token_prompt": "Please enter the code it contains:",
@@ -486,7 +489,6 @@
         "capabilities": "Capabilities",
         "copied": "Copied!",
         "credits": "Credits",
-        "cross_signing": "Cross-signing",
         "dark": "Dark",
         "description": "Description",
         "deselect_all": "Deselect all",
@@ -525,6 +527,7 @@
         "message_timestamp_invalid": "Invalid timestamp",
         "microphone": "Microphone",
         "model": "Model",
+        "moderation_and_safety": "Moderation and safety",
         "modern": "Modern",
         "mute": "Mute",
         "n_members": {
@@ -746,6 +749,13 @@
         "twemoji": "The <twemoji>Twemoji</twemoji> emoji art is © <author>Twitter, Inc and other contributors</author> used under the terms of <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "The <colr>twemoji-colr</colr> font is © <author>Mozilla Foundation</author> used under the terms of <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Are you sure you want to decline the invitation to join \"%(roomName)s\"?",
+        "ignore_user_help": "You will not see any messages or room invites from this user.",
+        "reason_description": "Describe the reason for reporting the room.",
+        "report_room_description": "Report this room to your account provider.",
+        "title": "Decline invitation"
+    },
     "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
     "devtools": {
         "active_widgets": "Active Widgets",
@@ -776,6 +786,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.",
@@ -788,6 +799,8 @@
             "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:"
         },
@@ -813,6 +826,7 @@
         "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",
@@ -901,44 +915,23 @@
     "empty_room_was_name": "Empty room (was %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Enter your Security Phrase or <button>use your Recovery Key</button> to continue.",
+            "alternatives": "If you have a security key or security phrase, this will work too.",
             "key_validation_text": {
-                "invalid_security_key": "Invalid Recovery Key",
-                "recovery_key_is_correct": "Looks good!",
-                "wrong_file_type": "Wrong file type",
-                "wrong_security_key": "Wrong Recovery Key"
+                "wrong_security_key": "The recovery key you entered is not correct."
             },
-            "reset_title": "Reset everything",
-            "reset_warning_1": "Only do this if you have no other device to complete verification with.",
-            "reset_warning_2": "If you reset everything, you will restart with no trusted sessions, no trusted users, and might not be able to see past messages.",
+            "privacy_warning": "Make sure nobody can see this screen!",
             "restoring": "Restoring keys from backup",
-            "security_key_title": "Recovery Key",
-            "security_phrase_incorrect_error": "Unable to access secret storage. Please verify that you entered the correct Security Phrase.",
-            "security_phrase_title": "Security Phrase",
-            "separator": "%(securityKey)s or %(recoveryFile)s",
-            "use_security_key_prompt": "Use your Recovery Key to continue."
+            "security_key_title": "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",
-        "cross_signing_not_ready": "Cross-signing is not set up.",
-        "cross_signing_ready": "Cross-signing is ready for use.",
-        "cross_signing_ready_no_backup": "Cross-signing is ready but keys are not backed up.",
         "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",
-        "cross_signing_unsupported": "Your homeserver does not support cross-signing.",
-        "cross_signing_untrusted": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
         "cross_signing_user_normal": "You have not verified this user.",
         "cross_signing_user_verified": "You have verified this user. This user has verified all of their sessions.",
         "cross_signing_user_warning": "This user has not verified all of their sessions.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Clear cross-signing keys",
-            "title": "Destroy cross-signing keys?",
-            "warning": "Deleting cross-signing keys is permanent. Anyone you have verified with will see security alerts. You almost certainly don't want to do this, unless you've lost every device you can cross-sign from."
-        },
         "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_key": "Encrypted by an unverified session",
@@ -965,7 +958,6 @@
             "title": "New Recovery Method",
             "warning": "If you didn't set the new recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings."
         },
-        "not_supported": "<not supported>",
         "pinned_identity_changed": "%(displayName)s's (<b>%(userId)s</b>) identity was reset. <a>Learn more</a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>'s identity was reset. <a>Learn more</a>",
         "recovery_method_removed": {
@@ -981,9 +973,10 @@
         "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.",
-            "title": "Set up"
+            "explainer": "Back up your keys before signing out to avoid losing them."
         },
+        "turn_on_key_storage": "Turn on key storage",
+        "turn_on_key_storage_description": "Store your cryptographic identity and message keys securely on the server. This will allow you to view your message history on any new devices.",
         "udd": {
             "interactive_verification_button": "Interactively verify by emoji",
             "other_ask_verify_text": "Ask this user to verify their session, or manually verify it below.",
@@ -997,7 +990,6 @@
             "accepting": "Accepting…",
             "after_new_login": {
                 "device_verified": "Device verified",
-                "reset_confirmation": "Really reset verification keys?",
                 "skip_verification": "Skip verification for now",
                 "unable_to_verify": "Unable to verify this device",
                 "verify_this_device": "Verify this device"
@@ -1019,7 +1011,22 @@
             "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_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.",
             "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.",
             "other_party_cancelled": "The other party cancelled the verification.",
             "prompt_encrypted": "Verify all users in a room to ensure it's secure.",
@@ -1068,8 +1075,6 @@
             "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_reset_warning_1": "Resetting your verification keys cannot be undone. After resetting, you won't have access to old encrypted messages, and any friends who have previously verified you will see security warnings until you re-verify with them.",
-            "verify_reset_warning_2": "Please only proceed if you're sure you've lost all of your other devices and your Recovery Key.",
             "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",
@@ -1138,11 +1143,7 @@
             "title": "Unable to copy room link"
         },
         "error_loading_user_profile": "Could not load user profile",
-        "forget_room_failed": "Failed to forget room %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Server may be unavailable, overloaded, or search timed out :(",
-            "title": "Search failed"
-        }
+        "forget_room_failed": "Failed to forget room %(errCode)s"
     },
     "error_user_not_logged_in": "User is not logged in",
     "event_preview": {
@@ -1677,6 +1678,7 @@
         "class_global": "Global",
         "class_other": "Other",
         "default": "Default",
+        "default_settings": "Match default settings",
         "email_pusher_app_display_name": "Email Notifications",
         "enable_prompt_toast_description": "Enable desktop notifications",
         "enable_prompt_toast_title": "Notifications",
@@ -1693,9 +1695,10 @@
         "mark_all_read": "Mark all as read",
         "mentions_and_keywords": "@mentions & keywords",
         "mentions_and_keywords_description": "Get notified only with mentions and keywords as set up in your <a>settings</a>",
-        "mentions_keywords": "Mentions & keywords",
+        "mentions_keywords": "Mentions and keywords",
         "message_didnt_send": "Message didn't send. Click for info.",
-        "mute_description": "You won't get any notifications"
+        "mute_description": "You won't get any notifications",
+        "mute_room": "Mute room"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s is requesting verification"
@@ -1797,11 +1800,6 @@
         "ongoing": "Removing…",
         "reason_label": "Reason (optional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Are you sure you want to reject the invitation?",
-        "failed": "Failed to reject invitation",
-        "title": "Reject invitation"
-    },
     "report_content": {
         "description": "Reporting this message will send its unique 'event ID' to the administrator of your homeserver. If messages in this room are encrypted, your homeserver administrator will not be able to read the message text or view any files or images.",
         "disagree": "Disagree",
@@ -1825,10 +1823,8 @@
         "toxic_behaviour": "Toxic Behaviour"
     },
     "report_room": {
-        "description": "Report this room to your homeserver admin. This will send the room's unique ID, but if messages are encrypted, the administrator won't be able to read them or view shared files.",
-        "reason_placeholder": " Reason for reporting...",
-        "sent": "Your report was sent.",
-        "title": "Report Room"
+        "description": "Report this room to your account provider. If the messages are encrypted, your admin will not be able to read them.",
+        "reason_label": "Describe the reason"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Failed to decrypt %(failedCount)s sessions!",
@@ -1978,6 +1974,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",
@@ -2013,7 +2010,6 @@
             "you_created": "You created this room."
         },
         "invite_email_mismatch_suggestion": "Share this email in Settings to receive invites directly in %(brand)s.",
-        "invite_reject_ignore": "Reject & Ignore user",
         "invite_sent_to_email": "This invite was sent to %(email)s",
         "invite_sent_to_email_room": "This invite to %(roomName)s was sent to %(email)s",
         "invite_subtitle": "Invited by <userName/>",
@@ -2070,6 +2066,7 @@
         "read_topic": "Click to read topic",
         "rejecting": "Rejecting invite…",
         "rejoin_button": "Re-join",
+        "room_is_low_priority": "This is a low priority room",
         "search": {
             "all_rooms_button": "Search all rooms",
             "placeholder": "Search messages…",
@@ -2109,6 +2106,7 @@
             },
             "uploading_single_file": "Uploading %(filename)s"
         },
+        "video_room": "This room is a video room",
         "waiting_for_join_subtitle": "Once invited users have joined %(brand)s, you will be able to chat and the room will be end-to-end encrypted",
         "waiting_for_join_title": "Waiting for users to join %(brand)s"
     },
@@ -2123,11 +2121,14 @@
             "no_chats_description_no_room_rights": "Get started by messaging someone",
             "no_favourites": "You don't have favourite chat 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_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",
             "no_rooms": "You’re not in any room yet",
             "no_rooms_description": "You can deselect filters in order to see your other chats",
             "no_unread": "Congrats! You don’t have any unread messages",
+            "show_activity": "See all activity",
             "show_chats": "Show all chats"
         },
         "failed_add_tag": "Failed to add tag %(tagName)s to room",
@@ -2135,9 +2136,12 @@
         "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",
-            "unread": "Unread"
+            "unread": "Unreads"
         },
         "home_menu_label": "Home options",
         "join_public_room_label": "Join public room",
@@ -2165,15 +2169,21 @@
             "more_options": "More Options",
             "open_room": "Open room %(roomName)s"
         },
+        "room_options": "Room Options",
         "show_less": "Show less",
         "show_n_more": {
             "one": "Show %(count)s more",
             "other": "Show %(count)s more"
         },
         "show_previews": "Show previews of messages",
+        "sort": "Sort",
         "sort_by": "Sort by",
         "sort_by_activity": "Activity",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Activity",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Show rooms with unread messages first",
         "space_menu": {
             "home": "Space home",
@@ -2461,6 +2471,10 @@
         "recent_changes_heading": "Recent changes that have not yet been received",
         "title": "Server isn't responding"
     },
+    "service_worker_error": {
+        "description": "%(brand)s requires a service worker for loading authenticated media from Matrix content repositories. This is not supported by your browser so you may experience media failing to load.",
+        "title": "Failed to load service worker"
+    },
     "seshat": {
         "error_initialising": "Message search initialisation failed, check <a>your settings</a> for more information",
         "reset_button": "Reset event store",
@@ -2539,6 +2553,7 @@
                 "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_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.",
                 "details_title": "Encryption details",
                 "do_not_close_warning": "Do not close this window until the reset is finished",
@@ -2553,6 +2568,8 @@
                 "session_key": "Session key:",
                 "title": "Advanced"
             },
+            "confirm_key_storage_off": "Are you sure you want to keep key storage turned off?",
+            "confirm_key_storage_off_description": "If you sign out of all your devices you will lose your message history and will need to verify all your existing contacts again. <a>Learn more</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Delete key storage",
                 "confirm": "Delete key storage",
@@ -2638,6 +2655,7 @@
             "discovery_needs_terms_title": "Let people find you",
             "display_name": "Display Name",
             "display_name_error": "Unable to set display name",
+            "email_adding_unsupported_by_hs": "This homeserver does not support adding email addresses to your account.",
             "email_address_in_use": "This email address is already in use",
             "email_address_label": "Email Address",
             "email_not_verified": "Your email address hasn't been verified yet",
@@ -2662,7 +2680,9 @@
             "error_share_msisdn_discovery": "Unable to share phone number",
             "identity_server_no_token": "No identity access token found",
             "identity_server_not_set": "Identity server not set",
+            "invalid_phone_number": "The phone number supplied does not appear to be valid.",
             "language_section": "Language",
+            "msisdn_adding_unsupported_by_hs": "This homeserver does not support adding phone numbers to your account.",
             "msisdn_in_use": "This phone number is already in use",
             "msisdn_label": "Phone Number",
             "msisdn_verification_field_label": "Verification code",
@@ -2681,12 +2701,13 @@
             "unable_to_load_msisdns": "Unable to load phone numbers",
             "username": "Username"
         },
-        "image_thumbnails": "Show previews/thumbnails for images",
         "inline_url_previews_default": "Enable inline URL previews by default",
         "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_avatars": "Show avatars of rooms you have been invited to",
+        "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).",
@@ -2745,6 +2766,15 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Settings:</strong> Ignored Users"
         },
+        "media_preview": {
+            "hide_avatars": "Hide avatars of room and inviter",
+            "hide_media": "Always hide",
+            "media_preview_description": "A hidden media can always be shown by tapping on it",
+            "media_preview_label": "Show media in timeline",
+            "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)",
@@ -2802,6 +2832,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)",
@@ -2830,57 +2861,20 @@
         "prompt_invite": "Prompt before sending invites to potentially invalid matrix IDs",
         "replace_plain_emoji": "Automatically replace plain text Emoji",
         "security": {
-            "4s_public_key_in_account_data": "in account data",
-            "4s_public_key_status": "Secret storage public key:",
             "analytics_description": "Share anonymous data to help us identify issues. Nothing personal. No third parties.",
-            "backup_key_cached_status": "Backup key cached:",
-            "backup_key_stored_status": "Backup key stored:",
-            "backup_key_unexpected_type": "unexpected type",
-            "backup_key_well_formed": "well formed",
-            "backup_keys_description": "Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.",
             "bulk_options_accept_all_invites": "Accept all %(invitedRooms)s invites",
             "bulk_options_reject_all_invites": "Reject all %(invitedRooms)s invites",
             "bulk_options_section": "Bulk options",
-            "cross_signing_cached": "cached locally",
-            "cross_signing_homeserver_support": "Homeserver feature support:",
-            "cross_signing_homeserver_support_exists": "exists",
-            "cross_signing_in_4s": "in secret storage",
-            "cross_signing_in_memory": "in memory",
-            "cross_signing_master_private_Key": "Master private key:",
-            "cross_signing_not_cached": "not found locally",
-            "cross_signing_not_found": "not found",
-            "cross_signing_not_in_4s": "not found in storage",
-            "cross_signing_not_stored": "not stored",
-            "cross_signing_private_keys": "Cross-signing private keys:",
-            "cross_signing_public_keys": "Cross-signing public keys:",
-            "cross_signing_self_signing_private_key": "Self signing private key:",
-            "cross_signing_user_signing_private_key": "User signing private key:",
-            "cryptography_section": "Cryptography",
             "dehydrated_device_description": "The offline device feature allows you to receive encrypted messages even when you are not logged in to any devices",
             "dehydrated_device_enabled": "Offline device enabled",
-            "delete_backup": "Delete Backup",
-            "delete_backup_confirm_description": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
             "dialog_title": "<strong>Settings:</strong> Security & Privacy",
             "e2ee_default_disabled_warning": "Your server admin has disabled end-to-end encryption by default in private rooms & Direct Messages.",
             "enable_message_search": "Enable message search in encrypted rooms",
             "encryption_section": "Encryption",
-            "error_loading_key_backup_status": "Unable to load key backup status",
-            "export_megolm_keys": "Export E2E room keys",
             "ignore_users_empty": "You have no ignored users.",
             "ignore_users_section": "Ignored users",
-            "import_megolm_keys": "Import E2E room keys",
-            "key_backup_active": "This session is backing up your keys.",
-            "key_backup_active_version": "Active backup version:",
-            "key_backup_active_version_none": "None",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_can_be_restored": "This backup can be restored on this session",
-            "key_backup_complete": "All keys backed up",
             "key_backup_connect": "Connect this session to Key Backup",
-            "key_backup_connect_prompt": "Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.",
-            "key_backup_in_progress": "Backing up %(sessionsRemaining)s keys…",
-            "key_backup_inactive": "This session is <b>not backing up your keys</b>, but you do have an existing backup you can restore from and add to going forward.",
-            "key_backup_inactive_warning": "Your keys are <b>not being backed up from this session</b>.",
-            "key_backup_latest_version": "Latest backup version on server:",
             "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": {
@@ -2900,13 +2894,7 @@
             "message_search_unsupported": "%(brand)s is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom %(brand)s Desktop with <nativeLink>search components added</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.",
             "record_session_details": "Record the client name, version, and url to recognise sessions more easily in session manager",
-            "restore_key_backup": "Restore from Backup",
-            "secret_storage_not_ready": "not ready",
-            "secret_storage_ready": "ready",
-            "secret_storage_status": "Secret storage:",
             "send_analytics": "Send analytics data",
-            "session_id": "Session ID:",
-            "session_key": "Session key:",
             "strict_encryption": "Only send messages to verified users"
         },
         "send_read_receipts": "Send read receipts",
@@ -3017,6 +3005,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",
@@ -3149,8 +3138,6 @@
         "topic": "Gets or sets the room topic",
         "topic_none": "This room has no topic.",
         "topic_room_error": "Failed to get room topic: Unable to find room (%(roomId)s",
-        "tovirtual": "Switches to this room's virtual room, if it has one",
-        "tovirtual_not_found": "No virtual room for this room",
         "unban": "Unbans user with given ID",
         "unflip": "Prepends ┬──┬ ノ( ゜-゜ノ) to a plain-text message",
         "unholdcall": "Takes the call in the current room off hold",
@@ -3165,6 +3152,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"
     },
@@ -3273,7 +3261,7 @@
         "heading_without_query": "Search for",
         "join_button_text": "Join %(roomAddress)s",
         "keyboard_scroll_hint": "Use <arrows/> to scroll",
-        "message_search_section_title": "Other searches",
+        "messages_label": "Messages",
         "other_rooms_in_space": "Other rooms in %(spaceName)s",
         "public_rooms_label": "Public rooms",
         "public_spaces_label": "Public spaces",
@@ -3283,7 +3271,6 @@
         "result_may_be_hidden_privacy_warning": "Some results may be hidden for privacy",
         "result_may_be_hidden_warning": "Some results may be hidden",
         "search_dialog": "Search Dialog",
-        "search_messages_hint": "To search messages, look for this icon at the top of a room <icon/>",
         "spaces_title": "Spaces you're in",
         "start_group_chat_button": "Start a group chat"
     },
@@ -3332,9 +3319,7 @@
     "threads_activity_centre": {
         "header": "Threads activity",
         "no_rooms_with_threads_notifs": "You don't have rooms with thread notifications yet.",
-        "no_rooms_with_unread_threads": "You don't have rooms with unread threads yet.",
-        "release_announcement_description": "Threads notifications have moved, find them here from now on.",
-        "release_announcement_header": "Threads Activity Centre"
+        "no_rooms_with_unread_threads": "You don't have rooms with unread threads yet."
     },
     "time": {
         "about_day_ago": "about a day ago",
@@ -3845,10 +3830,11 @@
         "unavailable": "Unavailable"
     },
     "update_room_access_modal": {
-        "description": "To create a share link, you need to allow guests to join this room. This may make the room less secure. When you're done with the call, you can make the room private again.",
-        "dont_change_description": "Alternatively, you can hold the call in a separate room.",
+        "description": "To create a share link, make this room <b>public</b> or enable the option for users to <b>ask to join</b>. This allows guests to join without being invited.",
+        "dont_change_description": "If you don't want to change the access of this room, you can create a new room for the call link.",
         "no_change": "I don't want to change the access level.",
-        "title": "Change the room access level"
+        "revert_access_description": "(This can be reverted to the previous value in the Room Settings: <b>Security & Privacy</b> / <b>Access</b>)",
+        "title": "Allow guest users to join this room"
     },
     "upload_failed_generic": "The file '%(fileName)s' failed to upload.",
     "upload_failed_size": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index e1d1e175a0..a6f28167ea 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -75,7 +75,6 @@
         "react": "Reagi",
         "refresh": "Aktualigi",
         "register": "Registri",
-        "reject": "Rifuzi",
         "remove": "Forigi",
         "reply": "Respondi",
         "report_content": "Raporti enhavon",
@@ -347,7 +346,6 @@
         "camera": "Kamerao",
         "copied": "Kopiita!",
         "credits": "Dankoj",
-        "cross_signing": "Delegaj subskriboj",
         "dark": "Malhela",
         "description": "Priskribo",
         "edited": "redaktita",
@@ -600,41 +598,22 @@
     "encryption": {
         "access_secret_storage_dialog": {
             "key_validation_text": {
-                "invalid_security_key": "Nevalida Sekureca ŝlosilo",
-                "recovery_key_is_correct": "Ŝajnas bona!",
-                "wrong_file_type": "Neĝusta dosiertipo",
                 "wrong_security_key": "Malĝusta Sekureca ŝlosilo"
             },
-            "reset_title": "Restarigi ĉion",
-            "reset_warning_1": "Faru tion ĉi nur se vi ne havas alian aparaton, per kiu vi kontrolus ceterajn.",
-            "reset_warning_2": "Se vi restarigos ĉion, vi rekomencos sen fidataj salutaĵoj, uzantoj, kaj eble ne povos vidi antaŭajn mesaĝojn.",
             "restoring": "Rehavo de ŝlosiloj el savkopio",
-            "security_key_title": "Sekureca ŝlosilo",
-            "security_phrase_incorrect_error": "Ne povas akiri sekretandeponejon. Bonvolu kontroli, ĉu vi enigis la ĝustan Sekurecan frazon.",
-            "security_phrase_title": "Sekureca frazo",
-            "use_security_key_prompt": "Uzu vian sekurecan ŝlosilon por daŭrigi."
+            "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_not_ready": "Delegaj subskriboj ne estas agorditaj.",
-        "cross_signing_ready": "Delegaj subskriboj estas pretaj por uzado.",
-        "cross_signing_ready_no_backup": "Delegaj subskriboj pretas, sed ŝlosiloj ne estas savkopiitaj.",
         "cross_signing_room_normal": "Ĉi tiu ĉambro uzas tutvojan ĉifradon",
         "cross_signing_room_verified": "Ĉiu en la ĉambro estas kontrolita",
         "cross_signing_room_warning": "Iu uzas nekonatan salutaĵon",
-        "cross_signing_unsupported": "Via hejmservilo ne subtenas delegajn subskribojn.",
-        "cross_signing_untrusted": "Via konto havas identecon por delegaj subskriboj en sekreta deponejo, sed ĉi tiu salutaĵo ankoraŭ ne fidas ĝin.",
         "cross_signing_user_normal": "Vi ne kontrolis tiun ĉi uzanton.",
         "cross_signing_user_verified": "Vi kontrolis tiun ĉi uzanton. Ĝi kontrolis ĉiomon da siaj salutaĵoj.",
         "cross_signing_user_warning": "Ĉi tiu uzanto ne kontrolis ĉiomon da siaj salutaĵoj.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Vakigi delege ĉifrajn ŝlosilojn",
-            "title": "Ĉu detrui delege ĉifrajn ŝlosilojn?",
-            "warning": "Forigo de delege ĉifraj ŝlosiloj estas porĉiama. Ĉiu, kun kiu vi interkontrolis, vidos avertojn pri sekureco. Vi preskaŭ certe ne volas ĉi tion fari, malse vi perdis ĉiun aparaton, el kiu vi povus delege subskribadi."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "La aŭtentikeco de ĉi tiu ĉifrita mesaĝo ne povas esti garantiita sur ĉi tiu aparato.",
         "event_shield_reason_mismatched_sender_key": "Ĉifrita de nekontrolita salutaĵo",
         "export_unsupported": "Via foliumilo ne subtenas la bezonatajn ĉifrajn kromprogramojn",
@@ -651,7 +630,6 @@
             "title": "Nova rehava metodo",
             "warning": "Se vi ne agordis la novan 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."
         },
-        "not_supported": "<nesubtenata>",
         "recovery_method_removed": {
             "description_1": "Tiu ĉi salutaĵo trovis, ke viaj Sekureca frazo kaj ŝlosilo por Sekuraj mesaĝoj foriĝis.",
             "description_2": "Se vi faris tion akcidente, vi povas agordi Sekurajn mesaĝojn en ĉi tiu salutaĵo, kio reĉifros la historion de mesaj de ĉi tiu salutaĵo kun nova rehava metodo.",
@@ -662,8 +640,7 @@
         "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.",
-            "title": "Agordi"
+            "explainer": "Savkopiu viajn ŝlosilojn antaŭ adiaŭo, por ilin ne perdi."
         },
         "udd": {
             "other_ask_verify_text": "Petu, ke ĉi tiu la uzanto kontrolu sian salutaĵon, aŭ kontrolu ĝin permane sube.",
@@ -777,11 +754,7 @@
             "title": "Ne povas kopii ligilon al ĉambro"
         },
         "error_loading_user_profile": "Ne povis enlegi profilon de uzanto",
-        "forget_room_failed": "Malsukcesis forgesi ĉambron %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Aŭ la servilo estas neatingebla aŭ troŝarĝita, aŭ la serĉo eltempiĝis :(",
-            "title": "Serĉo malsukcesis"
-        }
+        "forget_room_failed": "Malsukcesis forgesi ĉambron %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1219,11 +1192,6 @@
         "ongoing": "Forigante…",
         "reason_label": "Kialo (malnepra)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ĉu vi certe volas rifuzi la inviton?",
-        "failed": "Malsukcesis rifuzi la inviton",
-        "title": "Rifuzi inviton"
-    },
     "report_content": {
         "description": "Per raporto de ĉi tiu mesaĝo vi sendos ĝian unikan «identigilon de okazo» al la administranto de via hejmservilo. Se mesaĝoj en ĉi tiu ĉambro estas ĉifrataj, la administranto de via hejmservilo ne povos legi la tekston de la mesaĝo, nek rigardi dosierojn aŭ bildojn.",
         "disagree": "Malkonsento",
@@ -1324,7 +1292,6 @@
             "you_created": "Vi kreis ĉi tiun ĉambron."
         },
         "invite_email_mismatch_suggestion": "Havigu ĉi tiun retpoŝtadreson per Agordoj por ricevadi invitojn rekte per %(brand)s.",
-        "invite_reject_ignore": "Rifuzi kaj malatenti uzanton",
         "invite_sent_to_email_room": "La invito al %(roomName)s sendiĝis al %(email)s",
         "invite_subtitle": "<userName/> vin invitis",
         "invite_this_room": "Inviti al ĉi tiu ĉambro",
@@ -1726,7 +1693,6 @@
             "remove_email_prompt": "Ĉu forigi %(email)s?",
             "remove_msisdn_prompt": "Ĉu forigi %(phone)s?"
         },
-        "image_thumbnails": "Montri antaŭrigardojn/bildetojn por bildoj",
         "inline_url_previews_default": "Ŝalti entekstan antaŭrigardon al retadresoj",
         "inline_url_previews_room": "Ŝalti URL-antaŭrigardon por anoj de ĉi tiu ĉambro",
         "inline_url_previews_room_account": "Ŝalti URL-antaŭrigardon en ĉi tiu ĉambro (nur por vi)",
@@ -1818,48 +1784,16 @@
         "prompt_invite": "Averti antaŭ ol sendi invitojn al eble nevalidaj Matrix-identigiloj",
         "replace_plain_emoji": "Memfare anstataŭigi tekstajn mienetojn",
         "security": {
-            "4s_public_key_in_account_data": "en datumoj de konto",
-            "4s_public_key_status": "Publika ŝlosilo de sekreta deponejo:",
-            "backup_key_cached_status": "Kaŝmemorita Savkopia ŝlosilo:",
-            "backup_key_stored_status": "Deponita Savkopia ŝlosilo:",
-            "backup_key_unexpected_type": "neatendita tipo",
-            "backup_key_well_formed": "bone formita",
-            "backup_keys_description": "Savkopiu viajn čifrajn šlosilojn kune kun la datumoj de via konto, okaze ke vi perdos aliron al viaj salutaĵoj. Viaj ŝlosiloj sekuriĝos per unika Sekureca ŝlosilo.",
             "bulk_options_accept_all_invites": "Akcepti ĉiujn %(invitedRooms)s invitojn",
             "bulk_options_reject_all_invites": "Rifuzi ĉiujn %(invitedRooms)s invitojn",
             "bulk_options_section": "Amasaj elektebloj",
-            "cross_signing_cached": "kaŝmemorita loke",
-            "cross_signing_homeserver_support": "Funkciaj kapabloj de hejmservilo:",
-            "cross_signing_homeserver_support_exists": "ekzistas",
-            "cross_signing_in_4s": "en sekreta deponejo",
-            "cross_signing_in_memory": "en memoro",
-            "cross_signing_master_private_Key": "Ĉefa privata ŝlosilo:",
-            "cross_signing_not_cached": "ne trovita loke",
-            "cross_signing_not_found": "ne trovita",
-            "cross_signing_not_in_4s": "netrovite en deponejo",
-            "cross_signing_not_stored": "ne deponita",
-            "cross_signing_private_keys": "Delegaj privataj ŝlosiloj:",
-            "cross_signing_public_keys": "Delegaj publikaj ŝlosiloj:",
-            "cross_signing_self_signing_private_key": "Memsubskriba privata ŝlosilo:",
-            "cross_signing_user_signing_private_key": "Uzantosubskriba privata ŝlosilo:",
-            "cryptography_section": "Ĉifroteĥnikaro",
-            "delete_backup": "Forigi savkopion",
-            "delete_backup_confirm_description": "Ĉu vi certas? Vi perdos ĉiujn viajn ĉifritajn mesaĝojn, se viaj ŝlosiloj ne estas savkopiitaj.",
             "e2ee_default_disabled_warning": "La administranto de via servilo malŝaltis implicitan tutvojan ĉifradon en privataj kaj individuaj ĉambroj.",
             "enable_message_search": "Ŝalti serĉon de mesaĝoj en ĉifritaj ĉambroj",
             "encryption_section": "Ĉifrado",
-            "error_loading_key_backup_status": "Ne povas enlegi staton de ŝlosila savkopio",
-            "export_megolm_keys": "Elporti tutvoje ĉifrajn ŝlosilojn de la ĉambro",
             "ignore_users_empty": "Vi malatentas neniujn uzantojn.",
             "ignore_users_section": "Malatentaj uzantoj",
-            "import_megolm_keys": "Enporti tutvoje ĉifrajn ĉambrajn ŝlosilojn",
-            "key_backup_active_version_none": "Neniu",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_complete": "Ĉiuj ŝlosiloj estas savkopiitaj",
             "key_backup_connect": "Konekti ĉi tiun salutaĵon al Savkopiado de ŝlosiloj",
-            "key_backup_connect_prompt": "Konektu ĉi tiun salutaĵon al savkopiado de ŝlosiloj antaŭ ol vi adiaŭos, por ne perdi ŝlosilojn, kiuj povus troviĝi nur en ĉi tiu salutaĵo.",
-            "key_backup_inactive": "Ĉi tiu salutaĵo <b>ne savkopias viajn ŝlosilojn</b>, sed vi jam havas savkopion, el kiu vi povas rehavi datumojn, kaj ilin kreskigi plue.",
-            "key_backup_inactive_warning": "Viaj ŝlosiloj <b>ne estas savkopiataj el ĉi tiu salutaĵo</b>.",
             "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": {
@@ -1878,13 +1812,7 @@
             "message_search_space_used": "Spaco uzita:",
             "message_search_unsupported": "%(brand)s malhavas kelkajn partojn bezonajn por sekura loka kaŝmemorado de ĉirfitaj mesaĝoj. Se vi volas eksperimenti pri ĉi tiu kapablo, kunmetu propran klienton «%(brand)s Dekstop» kun <nativeLink>aldonitaj serĉopartoj</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s ne povas sekure kaŝkopii ĉifritajn mesaĝojn loke, funkciante per foliumilo. Uzu <desktopLink>%(brand)s Desktop</desktopLink> por aperigi ĉifritajn mesaĝojn en serĉrezultoj.",
-            "restore_key_backup": "Rehavi el savkopio",
-            "secret_storage_not_ready": "neprete",
-            "secret_storage_ready": "prete",
-            "secret_storage_status": "Sekreta deponejo:",
             "send_analytics": "Sendi statistikajn datumojn",
-            "session_id": "Identigilo de salutaĵo:",
-            "session_key": "Ŝlosilo de salutaĵo:",
             "strict_encryption": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj salutaĵoj de ĉi tiu salutaĵo"
         },
         "send_read_receipts": "Sendi legitajn kvitanojn",
@@ -2015,8 +1943,6 @@
         "topic": "Ekhavas aŭ agordas la temon de la ĉambro",
         "topic_none": "Ĉi tiu ĉambro ne havas temon.",
         "topic_room_error": "Malsukcesis akiri temo de ĉambro: Ne povas trovi ĉambron (%(roomId)s)",
-        "tovirtual": "Iri al virtuala ĉambro de tiu ĉambro, se la virtuala ĉambro ekzistas",
-        "tovirtual_not_found": "Tiu ĉambro ne havas virtuala ĉambro",
         "unban": "Malforbaras uzanton kun la donita identigilo",
         "unflip": "Antaŭmetas ┬──┬ ノ( ゜-゜ノ) al platteksta mesaĝo",
         "unholdcall": "Malpaŭzigas la vokon en la nuna ĉambro",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index d1318a8aa6..6abbdbe819 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -89,7 +89,6 @@
         "react": "Reaccionar",
         "refresh": "Refrescar",
         "register": "Crear cuenta",
-        "reject": "Rechazar",
         "reload": "Recargar",
         "remove": "Eliminar",
         "rename": "Cambiar nombre",
@@ -404,7 +403,6 @@
         "capabilities": "Funcionalidades",
         "copied": "¡Copiado!",
         "credits": "Créditos",
-        "cross_signing": "Firma cruzada",
         "dark": "Oscuro",
         "description": "Descripción",
         "deselect_all": "Deseleccionar todo",
@@ -743,44 +741,23 @@
     "empty_room_was_name": "Sala vacía (antes era %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Escribe tu frase de seguridad o <button>usa tu clave de seguridad</button> para continuar.",
             "key_validation_text": {
-                "invalid_security_key": "Clave de seguridad inválida",
-                "recovery_key_is_correct": "¡Se ve bien!",
-                "wrong_file_type": "Tipo de archivo incorrecto",
                 "wrong_security_key": "Clave de seguridad incorrecta"
             },
-            "reset_title": "Restablecer todo",
-            "reset_warning_1": "Solo haz esto si no tienes ningún otro dispositivo con el que completar la verificación.",
-            "reset_warning_2": "Si restableces todo, volverás a empezar sin sesiones ni usuarios de confianza, y puede que no puedas ver mensajes anteriores.",
             "restoring": "Restaurando las claves desde copia de seguridad",
-            "security_key_title": "Clave de seguridad",
-            "security_phrase_incorrect_error": "No se ha podido acceder al almacenamiento seguro. Por favor, comprueba que la frase de seguridad es correcta.",
-            "security_phrase_title": "Frase de seguridad",
-            "separator": "%(securityKey)s o %(recoveryFile)s",
-            "use_security_key_prompt": "Usa tu llave de seguridad para continuar."
+            "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_not_ready": "La firma cruzada no está configurada.",
-        "cross_signing_ready": "La firma cruzada está lista para su uso.",
-        "cross_signing_ready_no_backup": "La firma cruzada está lista, pero no hay copia de seguridad de las claves.",
         "cross_signing_room_normal": "Esta sala usa cifrado de extremo a extremo",
         "cross_signing_room_verified": "Todos los participantes en esta sala están verificados",
         "cross_signing_room_warning": "Alguien está usando una sesión desconocida",
-        "cross_signing_unsupported": "Tu servidor base no soporta las firmas cruzadas.",
-        "cross_signing_untrusted": "Su cuenta tiene una identidad de firma cruzada en un almacenamiento secreto, pero aún no es confiada en esta sesión.",
         "cross_signing_user_normal": "No has verificado a este usuario.",
         "cross_signing_user_verified": "Usted ha verificado este usuario. Este usuario ha verificado todas sus sesiones.",
         "cross_signing_user_warning": "Este usuario no ha verificado todas sus sesiones.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Borrar claves de firma cruzada",
-            "title": "¿Destruir las claves de firma cruzada?",
-            "warning": "La eliminación de claves de firma cruzada es definitiva. Cualquiera con el que lo hayas verificado verá alertas de seguridad. Es casi seguro que no quieres hacer esto, a menos que hayas perdido todos los dispositivos puedas usar hacer una firma cruzada."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "La autenticidad de este mensaje cifrado no puede ser garantizada en este dispositivo.",
         "event_shield_reason_mismatched_sender_key": "Cifrado por una sesión no verificada",
         "export_unsupported": "Su navegador no soporta las extensiones de criptografía requeridas",
@@ -800,7 +777,6 @@
             "title": "Nuevo método de recuperación",
             "warning": "Si no configuró el nuevo 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."
         },
-        "not_supported": "<no soportado>",
         "recovery_method_removed": {
             "description_1": "Esta sesión ha detectado que tu frase de seguridad y clave para mensajes seguros ha sido eliminada.",
             "description_2": "Si hizo esto accidentalmente, puede configurar Mensajes seguros en esta sesión que volverá a cifrar el historial de mensajes de esta sesión con un nuevo método de recuperación.",
@@ -811,8 +787,7 @@
         "set_up_toast_description": "Evita perder acceso a datos y mensajes cifrados",
         "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.",
-            "title": "Configurar"
+            "explainer": "Haz copia de seguridad de tus claves antes de cerrar sesión para evitar perderlas."
         },
         "udd": {
             "interactive_verification_button": "Verificar interactivamente usando emojis",
@@ -827,7 +802,6 @@
             "accepting": "Aceptando…",
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
-                "reset_confirmation": "¿De verdad quieres restablecer las claves de verificación?",
                 "skip_verification": "Saltar la verificación por ahora",
                 "unable_to_verify": "No se ha podido verificar el dispositivo",
                 "verify_this_device": "Verificar este dispositivo"
@@ -897,7 +871,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_reset_warning_1": "Una vez restableces las claves de verificación, no lo podrás deshacer. Después de restablecerlas, no podrás acceder a los mensajes cifrados antiguos, y cualquier persona que te haya verificado verá avisos de seguridad hasta que vuelvas a hacer la verificación con ella.",
             "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",
@@ -954,11 +927,7 @@
             "title": "No se ha podido copiar el enlace a la sala"
         },
         "error_loading_user_profile": "No se pudo cargar el perfil de usuario",
-        "forget_room_failed": "No se pudo olvidar la sala %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "El servidor podría estar saturado o desconectado, o la búsqueda caducó :(",
-            "title": "Falló la búsqueda"
-        }
+        "forget_room_failed": "No se pudo olvidar la sala %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1533,11 +1502,6 @@
         "ongoing": "Quitando…",
         "reason_label": "Motivo (opcional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "¿Estás seguro que quieres rechazar la invitación?",
-        "failed": "Falló al rechazar la invitación",
-        "title": "Rechazar invitación"
-    },
     "report_content": {
         "description": "Denunciar este mensaje enviará su único «event ID al administrador de tu servidor base. Si los mensajes en esta sala están cifrados, el administrador de tu servidor no podrá leer el texto del mensaje ni ver ningún archivo o imagen.",
         "disagree": "No estoy de acuerdo",
@@ -1687,7 +1651,6 @@
             "you_created": "Creaste esta sala."
         },
         "invite_email_mismatch_suggestion": "Comparte este correo electrónico en Configuración para recibir invitaciones directamente en %(brand)s.",
-        "invite_reject_ignore": "Rechazar e ignorar usuario",
         "invite_sent_to_email": "Esta invitación se envió a %(email)s",
         "invite_sent_to_email_room": "Esta invitación a %(roomName)s fue enviada a %(email)s",
         "invite_subtitle": "<userName/> te ha invitado",
@@ -2171,7 +2134,6 @@
             "remove_msisdn_prompt": "¿Eliminar %(phone)s?",
             "spell_check_locale_placeholder": "Elige un idioma"
         },
-        "image_thumbnails": "Mostrar vistas previas para las imágenes",
         "inline_url_previews_default": "Activar la vista previa de URLs en línea por defecto",
         "inline_url_previews_room": "Activar la vista previa de URLs por defecto para los participantes de esta sala",
         "inline_url_previews_room_account": "Activar la vista previa de URLs en esta sala (solo para ti)",
@@ -2274,48 +2236,16 @@
         "prompt_invite": "Preguntarme antes de enviar invitaciones a IDs de matrix que no parezcan válidas",
         "replace_plain_emoji": "Sustituir automáticamente caritas de texto por sus emojis equivalentes",
         "security": {
-            "4s_public_key_in_account_data": "en datos de cuenta",
-            "4s_public_key_status": "Clave pública del almacén secreto:",
-            "backup_key_cached_status": "Clave de respaldo almacenada en caché:",
-            "backup_key_stored_status": "Clave de respaldo almacenada:",
-            "backup_key_unexpected_type": "tipo inesperado",
-            "backup_key_well_formed": "bien formado",
-            "backup_keys_description": "Haz una copia de seguridad de tus claves de cifrado con los datos de tu cuenta por si pierdes acceso a tus sesiones. Las clave serán aseguradas con una clave de seguridad única.",
             "bulk_options_accept_all_invites": "Aceptar todas las invitaciones de %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Rechazar todas las invitaciones a %(invitedRooms)s",
             "bulk_options_section": "Opciones generales",
-            "cross_signing_cached": "almacenado localmente",
-            "cross_signing_homeserver_support": "Características compatibles con tu servidor base:",
-            "cross_signing_homeserver_support_exists": "existe",
-            "cross_signing_in_4s": "en almacén secreto",
-            "cross_signing_in_memory": "en memoria",
-            "cross_signing_master_private_Key": "Clave privada maestra:",
-            "cross_signing_not_cached": "no encontrado localmente",
-            "cross_signing_not_found": "no encontrado",
-            "cross_signing_not_in_4s": "no se ha encontrado en la memoria",
-            "cross_signing_not_stored": "no almacenado",
-            "cross_signing_private_keys": "Firmando las llaves privadas de manera cruzada:",
-            "cross_signing_public_keys": "Firmando las llaves públicas de manera cruzada:",
-            "cross_signing_self_signing_private_key": "Clave privada autofirmada:",
-            "cross_signing_user_signing_private_key": "Usuario firmando llave privada:",
-            "cryptography_section": "Criptografía",
-            "delete_backup": "Borrar copia de seguridad",
-            "delete_backup_confirm_description": "¿Estás seguro? Perderás tus mensajes cifrados si las claves no se copian adecuadamente.",
             "e2ee_default_disabled_warning": "El administrador de tu servidor base ha desactivado el cifrado de extremo a extremo en salas privadas y mensajes directos.",
             "enable_message_search": "Activar la búsqueda de mensajes en salas cifradas",
             "encryption_section": "Cifrado",
-            "error_loading_key_backup_status": "No se pudo cargar el estado de la copia de la clave",
-            "export_megolm_keys": "Exportar claves de salas con cifrado de extremo a extremo",
             "ignore_users_empty": "No has ignorado a nadie.",
             "ignore_users_section": "Usuarios ignorados",
-            "import_megolm_keys": "Importar claves de salas con cifrado de extremo a extremo",
-            "key_backup_active_version_none": "Ninguno",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_complete": "Se han copiado todas las claves",
             "key_backup_connect": "Conecta esta sesión a la copia de respaldo de tu clave",
-            "key_backup_connect_prompt": "Conecte esta sesión a la copia de seguridad de las claves antes de firmar y así evitar perder las claves que sólo existen en esta sesión.",
-            "key_backup_inactive": "Esta sesión no <b> ha creado una copia de seguridad de tus llaves</b>, pero tienes una copia de seguridad existente de la que puedes restaurar y añadir para proceder.",
-            "key_backup_inactive_warning": "<b>No se está haciendo una copia de seguridad de tus claves en esta sesión</b>.",
             "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": {
@@ -2335,13 +2265,7 @@
             "message_search_unsupported": "A %(brand)s le faltan algunos componentes necesarios para el almacenamiento seguro de mensajes cifrados a nivel local. Si quieres experimentar con esta característica, construye un Escritorio %(brand)s personalizado con <nativeLink> componentes de búsqueda añadidos</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s no puede almacenar en caché de forma segura mensajes cifrados localmente mientras se ejecuta en un navegador web. Usa <desktopLink> %(brand)s Escritorio</desktopLink> para que los mensajes cifrados aparezcan en los resultados de búsqueda.",
             "record_session_details": "Registrar el nombre del cliente, la versión y URL para reconocer de forma más fácil las sesiones en el gestor",
-            "restore_key_backup": "Restaurar una copia de seguridad",
-            "secret_storage_not_ready": "no está listo",
-            "secret_storage_ready": "Listo",
-            "secret_storage_status": "Almacenamiento secreto:",
             "send_analytics": "Enviar datos estadísticos de uso",
-            "session_id": "Identidad (ID) de sesión:",
-            "session_key": "Código de sesión:",
             "strict_encryption": "No enviar nunca mensajes cifrados a sesiones sin verificar desde esta sesión"
         },
         "send_read_receipts": "Enviar acuses de recibo",
@@ -2547,8 +2471,6 @@
         "topic": "Ver o cambiar el asunto de la sala",
         "topic_none": "Esta sala no tiene asunto.",
         "topic_room_error": "Fallo al obtener el asunto de la sala: No se ha podido encontrar la sala (%(roomId)s",
-        "tovirtual": "Cambia a la sala virtual de esta sala, si tiene una",
-        "tovirtual_not_found": "Esta sala no tiene una sala virtual",
         "unban": "Desbloquea el usuario con ese ID",
         "unflip": "Pone «┬──┬ ノ( ゜-゜ノ)» después de un mensaje de texto",
         "unholdcall": "Quita la llamada de la sala actual de espera",
@@ -2667,7 +2589,6 @@
         "heading_without_query": "Buscar",
         "join_button_text": "Unirte a %(roomAddress)s",
         "keyboard_scroll_hint": "Usa <arrows/> para desplazarte",
-        "message_search_section_title": "Otras búsquedas",
         "other_rooms_in_space": "Otras salas en %(spaceName)s",
         "public_rooms_label": "Salas públicas",
         "recent_searches_section_title": "Búsquedas recientes",
@@ -2676,7 +2597,6 @@
         "result_may_be_hidden_privacy_warning": "Algunos resultados pueden estar ocultos por motivos de privacidad",
         "result_may_be_hidden_warning": "Algunos resultados pueden estar ocultos",
         "search_dialog": "Ventana de búsqueda",
-        "search_messages_hint": "Para buscar contenido de mensajes, usa este icono en la parte de arriba de una sala: <icon/>",
         "spaces_title": "Tus espacios",
         "start_group_chat_button": "Crear conversación en grupo"
     },
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index b62c9cd7bb..7dee6e6a31 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -12,6 +12,16 @@
             "other": "%(count)s lugemata sõnumit kaasa arvatud mainimised."
         },
         "recent_rooms": "Hiljuti kasutatud jututoad",
+        "room_messsage_not_sent": "Ava „%(roomName)s“ jututuba saatmata sõnumiga.",
+        "room_n_unread_invite": "Ava %(roomName)s jututoa kutse.",
+        "room_n_unread_messages": {
+            "one": "Ava %(roomName)s jututuba 1 lugemata sõnumiga.",
+            "other": "Ava %(roomName)s jututuba %(count)s lugemata sõnumiga."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Ava %(roomName)s jututuba 1 lugemata mainimisega.",
+            "other": "Ava %(roomName)s jututuba %(count)s lugemata sõnumiga, mille hulgas on ka mainimisi."
+        },
         "room_name": "Jututuba %(name)s",
         "room_status_bar": "Jututoa olekuriba",
         "seek_bar_label": "Heli kerimisriba",
@@ -45,6 +55,8 @@
         "create_a_room": "Loo jututuba",
         "create_account": "Loo konto",
         "decline": "Keeldu",
+        "decline_and_block": "Keeldu ja blokeeri",
+        "decline_invite": "Lükka kutse tagasi",
         "delete": "Kustuta",
         "deny": "Keeldu",
         "disable": "Lülita välja",
@@ -64,6 +76,7 @@
         "go": "Mine",
         "go_back": "Mine tagasi",
         "got_it": "Selge lugu",
+        "hide": "Peida",
         "hide_advanced": "Peida lisaseadistused",
         "hold": "Pane ootele",
         "ignore": "Eira",
@@ -80,12 +93,14 @@
         "maximise": "Suurenda maksimaalseks",
         "mention": "Maini",
         "minimise": "Väike vaade",
+        "new_message": "Uus sõnum",
         "new_room": "Uus jututuba",
         "new_video_room": "Uus videotuba",
         "next": "Järgmine",
         "no": "Ei",
         "ok": "Sobib",
         "open": "Ava",
+        "open_menu": "Ava menüü",
         "pause": "Peata",
         "pin": "Tõsta esile",
         "play": "Esita",
@@ -94,13 +109,13 @@
         "react": "Reageeri",
         "refresh": "Värskenda",
         "register": "Registreeru",
-        "reject": "Hülga",
         "reload": "Laadi uuesti",
         "remove": "Eemalda",
         "rename": "Muuda nime",
         "reply": "Vasta",
         "reply_in_thread": "Vasta jutulõngas",
         "report_content": "Teata sisust haldurile",
+        "report_room": "Teata jututoast",
         "resend": "Saada uuesti",
         "reset": "Taasta algolek",
         "resume": "Jätka",
@@ -142,6 +157,7 @@
         "view_message": "Vaata sõnumit",
         "view_source": "Vaata lähtekoodi",
         "yes": "Jah",
+        "yes_dismiss": "Jah, loobu",
         "zoom_in": "Suumi sisse",
         "zoom_out": "Suumi välja"
     },
@@ -371,6 +387,7 @@
             "fallback_button": "Alusta autentimist",
             "mas_cross_signing_reset_cta": "Mine oma kasutajakonto andmete juurde",
             "mas_cross_signing_reset_description": "Lähtesta oma võrguidentiteet oma teenusepakkuja abil ning tule siis siia tagasi ja vajuta „Proovi uuesti“.",
+            "mas_cross_signing_reset_title": "Oma võrguidentiteedi lähtestamiseks ava oma kasutajakonto vaade",
             "msisdn": "Saatsime tekstisõnumi telefoninumbrile %(msisdn)s",
             "msisdn_token_incorrect": "Vigane tunnusluba",
             "msisdn_token_prompt": "Palun sisesta seal kuvatud kood:",
@@ -405,6 +422,15 @@
         "download_logs": "Laadi logikirjed alla",
         "downloading_logs": "Laadin logisid alla",
         "error_empty": "Palun kirjelda seda, mis läks valesti ja loo GitHub'is veateade.",
+        "failed_download_logs": "Silumislogide allalaadimine ei õnnestunud: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Sinu veateadet ei võetud vastu. Ägedal raputamisel põhinev vigadest teatamise teenus ei toeta seda rakendust.",
+            "rejected_generic": "Sinu veateadet ei võetud vastu. Ägedal raputamisel põhinev vigadest teatamise teenus keeldus päringu sisust oma reeglite alusel.",
+            "rejected_recovery_key": "Kuna veateade sisaldas sinu taastevõtit, siis turvakaalutlustel sinu veateadet ei võetud vastu.",
+            "rejected_version": "Kuna kasutad rakenduse liiga vana versiooni, siis sinu veateadet ei võetud vastu.",
+            "server_unknown_error": "Ägedal raputamisel põhinev vigadest teatamise teenuses tekkis teadmata probleem, mille käigus ta ei osanud seda veateadet töödelda.",
+            "unknown_error": "Logikirjete saatmine ei õnnestunud."
+        },
         "github_issue": "Veateade GitHub'is",
         "introduction": "Kui sa oled GitHub'is teinud meile veateate, siis silumislogid võivad aidata vea lahendamisel. ",
         "log_request": "Tagamaks et sama ei juhtuks tulevikus, palun <a>saada meile salvestatud logid</a>.",
@@ -444,6 +470,7 @@
         "access_token": "Pääsuluba",
         "accessibility": "Ligipääsetavus",
         "advanced": "Teave arendajatele",
+        "all_chats": "Kõik vestlused",
         "analytics": "Analüütika",
         "and_n_others": {
             "other": "ja %(count)s muud...",
@@ -462,7 +489,6 @@
         "capabilities": "Funktsionaalsused ja võimed",
         "copied": "Kopeeritud!",
         "credits": "Tänuavaldused",
-        "cross_signing": "Risttunnustamine",
         "dark": "Tume",
         "description": "Kirjeldus",
         "deselect_all": "Eemalda kõik valikud",
@@ -501,6 +527,7 @@
         "message_timestamp_invalid": "Vigane ajatempel",
         "microphone": "Mikrofon",
         "model": "Mudel",
+        "moderation_and_safety": "Modereerimine ja turvalisus",
         "modern": "Moodne",
         "mute": "Summuta",
         "n_members": {
@@ -722,6 +749,13 @@
         "twemoji": "<twemoji>Twemoji</twemoji> emotikonide autoriõiguste omanik on <author>Twitter, Inc koos kaasautoritega</author> ning neid kasutame vastavalt <terms>CC-BY 4.0</terms> litsentsi tingimustele.",
         "twemoji_colr": "<colr>Twemoji-colr</colr> kirjatüübi autoriõiguste omanik on <author>Mozilla Foundation</author> seda kasutame vastavalt <terms>Apache 2.0</terms> litsentsi tingimustele."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Kas sa oled kindel, et soovid keelduda kutsest liituda „%(roomName)s“ jututoaga?",
+        "ignore_user_help": "Sa ei näe enam selle kasutaja saadetud sõnumeid või jututubade kutseid",
+        "reason_description": "Kirjelda jututoast teatamise põhjust",
+        "report_room_description": "Teata sellest jututoast oma teenusepakkujale.",
+        "title": "Lükka kutse tagasi"
+    },
     "desktop_default_device_name": "%(brand)s töölaud: %(platformName)s",
     "devtools": {
         "active_widgets": "Kasutusel vidinad",
@@ -822,6 +856,9 @@
         "setting_colon": "Seadistus:",
         "setting_definition": "Seadistuse määratlus:",
         "setting_id": "Seadistuse tunnus",
+        "settings": {
+            "elementCallUrl": "Element Calli võrguaadress"
+        },
         "settings_explorer": "Seadistuste haldur",
         "show_hidden_events": "Näita peidetud sündmusi ajajoonel",
         "spaces": {
@@ -874,44 +911,26 @@
     "empty_room_was_name": "Tühi jututuba (varasema nimega %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Jätkamiseks sisesta oma turvafraas või <button>kasuta oma turvavõtit</button>.",
+            "alternatives": "Kui sul on turvavõti või turvafraas, siis need toimivad ka.",
             "key_validation_text": {
-                "invalid_security_key": "Vigane turvavõti",
-                "recovery_key_is_correct": "Tundub õige!",
-                "wrong_file_type": "Vale failitüüp",
-                "wrong_security_key": "Vale turvavõti"
+                "wrong_security_key": "Sinu sisestatud taastevõti pole korrektne."
             },
-            "reset_title": "Alusta kõigega algusest",
-            "reset_warning_1": "Toimi nii vaid siis, kui sul pole jäänud ühtegi seadet, millega verifitseerimist lõpuni teha.",
-            "reset_warning_2": "Kui sa kõik krüptoseosed lähtestad, siis sul esimese hooga pole ühtegi usaldusväärseks tunnistatud sessiooni ega kasutajat ning ilmselt ei saa sa lugeda vanu sõnumeid.",
+            "privacy_warning": "Palun vaata, et keegi teine ei näeks seda ekraanivaadet!",
             "restoring": "Taastan võtmed varundusest",
-            "security_key_title": "Turvavõti",
-            "security_phrase_incorrect_error": "Ei õnnestu saada ligipääsu turvahoidlale. Palun kontrolli, et sa oleksid sisestanud õige turvafraasi.",
-            "security_phrase_title": "Turvafraas",
-            "separator": "%(securityKey)s või %(recoveryFile)s",
-            "use_security_key_prompt": "Jätkamiseks kasuta turvavõtit."
+            "security_key_title": "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",
-        "cross_signing_not_ready": "Risttunnustamine on seadistamata.",
-        "cross_signing_ready": "Risttunnustamine on kasutamiseks valmis.",
-        "cross_signing_ready_no_backup": "Risttunnustamine on töövalmis, aga krüptovõtmed on varundamata.",
         "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",
-        "cross_signing_unsupported": "Sinu koduserver ei toeta risttunnustamist.",
-        "cross_signing_untrusted": "Sinu kontol on turvahoidlas olemas risttunnustamise identiteet, kuid seda veel ei loeta antud sessioonis usaldusväärseks.",
         "cross_signing_user_normal": "Sa ei ole seda kasutajat verifitseerinud.",
         "cross_signing_user_verified": "Sa oled selle kasutaja verifitseerinud. See kasutaja on verifitseerinud kõik nende sessioonid.",
         "cross_signing_user_warning": "See kasutaja ei ole verifitseerinud kõiki oma sessioone.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Eemalda risttunnustamise võtmed",
-            "title": "Kas hävitame risttunnustamise võtmed?",
-            "warning": "Risttunnustamise võtmete kustutamine on tegevus, mida ei saa tagasi pöörata. Kõik sinu verifitseeritud vestluskaaslased näevad seejärel turvateateid. Kui sa just pole kaotanud ligipääsu kõikidele oma seadmetele, kust sa risttunnustamist oled teinud, siis sa ilmselgelt ei peaks kustutamist ette võtma."
-        },
+        "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_key": "Krüptitud verifitseerimata sessiooni poolt",
         "event_shield_reason_unknown_device": "Krüptitud tundmatu või kustutatud seadme poolt.",
@@ -937,9 +956,8 @@
             "title": "Uus taastamise meetod",
             "warning": "Kui sa ei ole ise uusi taastamise meetodeid lisanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod."
         },
-        "not_supported": "<ei ole toetatud>",
-        "pinned_identity_changed": "Kasutaja %(displayName)s (<b>%(userId)s</b>) võrguidentiteet tundub olema muutunud. <a>Lisateave</a>",
-        "pinned_identity_changed_no_displayname": "Kasutaja <b>%(userId)s</b> võrguidentiteet tundub olema muutunud. <a>Lisateave</a>",
+        "pinned_identity_changed": "Kasutaja %(displayName)s (<b>%(userId)s</b>) võrguidentiteet on lähtestatud. <a>Lisateave</a>",
+        "pinned_identity_changed_no_displayname": "Kasutaja <b>%(userId)s</b> võrguidentiteet on lähtestatud. <a>Lisateave</a>",
         "recovery_method_removed": {
             "description_1": "Oleme tuvastanud, et selles sessioonis ei leidu turvafraasi ega krüptitud sõnumite turvavõtit.",
             "description_2": "Kui sa tegid seda juhuslikult, siis sa võid selles sessioonis uuesti seadistada sõnumite krüptimise, mille tulemusel krüptime uuesti kõik sõnumid ja loome uue taastamise meetodi.",
@@ -953,9 +971,10 @@
         "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.",
-            "title": "Võta kasutusele"
+            "explainer": "Vältimaks nende kaotamist, varunda krüptovõtmed enne väljalogimist."
         },
+        "turn_on_key_storage": "Võta krüptovõtmete hoidla kasutusele",
+        "turn_on_key_storage_description": "Salvesta oma krüptoidentiteet ja sõnumite krüptovõtmed turvaliselt serveris. See tagab, et sinu sõnumite ajalugu on alati loetav, ka kõikides uutes seadmetes.",
         "udd": {
             "interactive_verification_button": "Verifitseeri interaktiivselt emoji abil",
             "other_ask_verify_text": "Palu nimetatud kasutajal verifitseerida see sessioon või tee seda alljärgnevaga käsitsi.",
@@ -969,7 +988,6 @@
             "accepting": "Nõustun …",
             "after_new_login": {
                 "device_verified": "Seade on verifitseeritud",
-                "reset_confirmation": "Kas tõesti kustutame kõik verifitseerimisvõtmed?",
                 "skip_verification": "Jäta verifitseerimine praegu vahele",
                 "unable_to_verify": "Selle seadme verifitseerimine ei õnnestunud",
                 "verify_this_device": "Verifitseeri see seade"
@@ -991,7 +1009,7 @@
             "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 turvavõtit ega muid seadmeid, mida saaksid verifitseerimiseks kasutada. Siin seadmes ei saa lugeda vanu krüptitud sõnumeid. Enda tuvastamiseks selles seadmed pead oma vanad verifitseerimisvõtmed kustutama.",
+            "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.",
             "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.",
             "other_party_cancelled": "Teine osapool tühistas verifitseerimise.",
             "prompt_encrypted": "Tagamaks, et jututuba on turvaline, verifitseeri kõik selle kasutajad.",
@@ -1040,19 +1058,20 @@
             "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_reset_warning_1": "Verifitseerimisvõtmete kustutamist ei saa hiljem tagasi võtta. Peale seda sul puudub ligipääs vanadele krüptitud sõnumitele ja kõik sinu verifitseeritud sõbrad-tuttavad näevad turvahoiatusi seni kuni sa uuesti nad verifitseerid.",
-            "verify_reset_warning_2": "Palun jätka ainult siis, kui sa oled kaotanud ligipääsu kõikidele oma seadmetele ning oma turvavõtmele.",
             "verify_using_device": "Verifitseeri teise seadmega",
-            "verify_using_key": "Verifitseeri turvavõtmega",
-            "verify_using_key_or_phrase": "Verifitseeri turvavõtme või turvafraasiga",
+            "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)…",
             "waiting_other_user": "Ootan kasutaja %(displayName)s verifitseerimist…"
         },
         "verification_requested_toast_title": "Verifitseerimistaotlus on saadetud",
+        "verified_identity_changed": "Kasutaja %(displayName)s (<b>%(userId)s</b>) verifitseeritud identiteet on muutunud. <a>Lisateave</a>",
+        "verified_identity_changed_no_displayname": "Kasutaja <b>%(userId)s</b> verifitseeritud identiteet on muutunud. <a>Lisateave</a>",
         "verify_toast_description": "Teised kasutajad ei pruugi seda usaldada",
-        "verify_toast_title": "Verifitseeri see sessioon"
+        "verify_toast_title": "Verifitseeri see sessioon",
+        "withdraw_verification_action": "Eemalda verifitseerimine"
     },
     "error": {
         "admin_contact": "Jätkamaks selle teenuse kasutamist palun <a>võta ühendust oma teenuse haldajaga</a>.",
@@ -1107,11 +1126,7 @@
             "title": "Jututoa lingi kopeerimine ei õnnestu"
         },
         "error_loading_user_profile": "Kasutajaprofiili laadimine ei õnnestunud",
-        "forget_room_failed": "Jututoa unustamine ei õnnestunud %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Server kas pole leitav, on ülekoormatud või otsing aegus :(",
-            "title": "Otsing ebaõnnestus"
-        }
+        "forget_room_failed": "Jututoa unustamine ei õnnestunud %(errCode)s"
     },
     "error_user_not_logged_in": "Kasutaja pole võrku loginud",
     "event_preview": {
@@ -1236,6 +1251,7 @@
         "change": "Muuda isikutuvastusserverit",
         "change_prompt": "Kas katkestame ühenduse <current /> isikutuvastusserveriga ning selle asemel loome uue ühenduse serveriga <new />?",
         "change_server_prompt": "Kui sa ei soovi kasutada <server /> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi, siis sisesta alljärgnevalt mõni teine isikutuvastusserver.",
+        "changed": "Sinu kasutatav isikutuvastusserver on muutunud",
         "checking": "Kontrollin serverit",
         "description_connected": "Sa hetkel kasutad <server></server> serverit, et olla leitav ja ise leida sinule teadaolevaid inimesi. Alljärgnevalt saad sa muuta oma isikutuvastusserverit.",
         "description_disconnected": "Sa hetkel ei kasuta isikutuvastusserverit. Et olla leitav ja ise leida sinule teadaolevaid inimesi seadista ta alljärgnevalt.",
@@ -1278,7 +1294,9 @@
         "title": "Sellele brauserile puudub tugi",
         "use_desktop_heading": "Selle asemel kasuta %(brand)s töölauaversiooni",
         "use_mobile_heading": "Selle asemel kasuta %(brand)s nutiseadmeversiooni",
-        "use_mobile_heading_after_desktop": "Või kasuta meie rakendust nutiseadmetele"
+        "use_mobile_heading_after_desktop": "Või kasuta meie rakendust nutiseadmetele",
+        "windows_64bit": "Windows (64-bitine)",
+        "windows_arm_64bit": "Windows (64-bitine ARM-platvormil)"
     },
     "info_tooltip_title": "Teave",
     "integration_manager": {
@@ -1287,6 +1305,7 @@
         "error_connecting_heading": "Ei saa ühendust lõiminguhalduriga",
         "explainer": "Lõiminguhalduritel on laiad volitused - nad võivad sinu nimel lugeda seadistusi, kohandada vidinaid, saata jututubade kutseid ning määrata õigusi.",
         "manage_title": "Halda lõiminguid",
+        "toggle_label": "Kasuta lõimingute haldurit",
         "use_im": "Robotite, vidinate ja kleepsupakkide seadistamiseks kasuta lõiminguhaldurit.",
         "use_im_default": "Robotite, vidinate ja kleepsupakkide jaoks kasuta lõiminguhaldurit <b>(%(serverName)s)</b>."
     },
@@ -1488,6 +1507,7 @@
         "location_share_live_description": "Tegemist on ajutise ja esialgse lahendusega: asukohad on jututoa ajaloos näha.",
         "mjolnir": "Uued võimalused osalejate eiramiseks",
         "msc3531_hide_messages_pending_moderation": "Luba modereerimist ootavate sõnumite peitmist.",
+        "new_room_list": "Võta kasutusele uus jututubade loend",
         "notification_settings": "Uued teavituste seadistused",
         "notification_settings_beta_caption": "Võtame kasutusele senisest lihtsama viisi teavituste seadistamiseks. Kohanda rakendust %(brand)s nii nagu soovid.",
         "notification_settings_beta_title": "Teavituste seadistused",
@@ -1641,6 +1661,7 @@
         "class_global": "Üldised",
         "class_other": "Muud",
         "default": "Tavaline",
+        "default_settings": "Sobita vaikimisi seadistustega",
         "email_pusher_app_display_name": "E-posti teel saadetavad teavitused",
         "enable_prompt_toast_description": "Võta kasutusele töölauakeskkonna teavitused",
         "enable_prompt_toast_title": "Teavitused",
@@ -1659,7 +1680,8 @@
         "mentions_and_keywords_description": "Soovin teavitusi sellisena mainimiste ja võtmesõnade puhul, nagu ma neid olen <a>seadistanud</a>",
         "mentions_keywords": "Mainimised ja märksõnad",
         "message_didnt_send": "Sõnum jäi saatmata. Lisateabe saamiseks klõpsi.",
-        "mute_description": "Sa ei saa üldse teavitusi"
+        "mute_description": "Sa ei saa üldse teavitusi",
+        "mute_room": "Summuta jututuba"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s soovib verifitseerimist"
@@ -1761,11 +1783,6 @@
         "ongoing": "Eemaldan…",
         "reason_label": "Põhjus (kui soovid lisada)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Kas sa oled kindel, et soovid lükata kutse tagasi?",
-        "failed": "Kutse tagasi lükkamine ei õnnestunud",
-        "title": "Lükka kutse tagasi"
-    },
     "report_content": {
         "description": "Sellest sõnumist teatamine saadab tema unikaalse sõnumi tunnuse sinu koduserveri haldurile. Kui selle jututoa sõnumid on krüptitud, siis sinu koduserveri haldur ei saa lugeda selle sõnumi teksti ega vaadata seal leiduvaid faile ja pilte.",
         "disagree": "Ma ei nõustu sisuga",
@@ -1788,27 +1805,31 @@
         "spam_or_propaganda": "Spämm või propaganda",
         "toxic_behaviour": "Ebasobilik käitumine"
     },
+    "report_room": {
+        "description": "Teata sellest jututoast oma koduserveri haldajale. Kui sõnumid on krüptitud, ei saa haldaja neid lugeda ega jagatud faile vaadata.",
+        "reason_label": "Palun kirjelda põhjust"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "%(failedCount)s sessiooni dekrüptimine ei õnnestunud!",
         "count_of_successfully_restored_keys": "%(sessionCount)s sessiooni võtme taastamine õnnestus",
-        "enter_key_description": "Sisestades turvavõtme pääsed ligi oma turvatud sõnumitele ning sätid tööle krüptitud sõnumivahetuse.",
-        "enter_key_title": "Sisesta turvavõti",
+        "enter_key_description": "Sisestades taastevõtme pääsed ligi oma turvatud sõnumitele ning sätid tööle krüptitud sõnumivahetuse.",
+        "enter_key_title": "Sisesta taastevõti",
         "enter_phrase_description": "Sisestades turvafraasi, saad ligipääsu oma turvatud sõnumitele ning sätid toimima krüptitud sõnumivahetuse.",
         "enter_phrase_title": "Sisesta turvafraas",
         "incorrect_security_phrase_dialog": "Selle turvafraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget turvafraasi.",
         "incorrect_security_phrase_title": "Vigane turvafraas",
         "key_backup_warning": "<b>Hoiatus</b>: sa peaksid võtmete varunduse seadistama vaid usaldusväärsest arvutist.",
         "key_fetch_in_progress": "Laadin serverist võtmeid…",
-        "key_forgotten_text": "Kui sa oled unustanud oma turvavõtme, siis sa võid <button>seadistada uued taastamise võimalused</button>",
-        "key_is_invalid": "Vigane turvavõti",
-        "key_is_valid": "See tundub olema õige turvavõti!",
+        "key_forgotten_text": "Kui sa oled unustanud oma taastevõtme, siis sa võid <button>seadistada uued taastamise võimalused</button>",
+        "key_is_invalid": "See pole korrektne taastevõti",
+        "key_is_valid": "See tundub olema õige taastevõti!",
         "keys_restored_title": "Krüptimise võtmed on taastatud",
         "load_error_content": "Varunduse oleku laadimine ei õnnestunud",
         "load_keys_progress": "%(completed)s / %(total)s võtit taastatud",
         "no_backup_error": "Varukoopiat ei leidunud!",
-        "phrase_forgotten_text": "Kui sa oled unustanud turvafraasi, siis sa saad <button1>kasutada oma turvavõtit</button1> või <button2>seadistada uued taastamise võimalused</button2>",
-        "recovery_key_mismatch_description": "Selle turvavõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget turvavõtit.",
-        "recovery_key_mismatch_title": "Turvavõtmed ei klapi",
+        "phrase_forgotten_text": "Kui sa oled unustanud turvafraasi, siis sa saad <button1>kasutada oma taastevõtit</button1> või <button2>seadistada uued taastamise võimalused</button2>",
+        "recovery_key_mismatch_description": "Selle taastevõtmega ei õnnestunud varukoopiat dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.",
+        "recovery_key_mismatch_title": "Taastevõtmed ei klapi",
         "restore_failed_error": "Varukoopiast taastamine ei õnnestu"
     },
     "right_panel": {
@@ -1936,6 +1957,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",
@@ -1971,7 +1993,6 @@
             "you_created": "Sa lõid selle jututoa."
         },
         "invite_email_mismatch_suggestion": "Selleks, et saada kutseid otse %(brand)s'isse, jaga oma seadetes seda e-posti aadressi.",
-        "invite_reject_ignore": "Hülga ja eira kasutaja",
         "invite_sent_to_email": "See kutse saadeti e-posti aadressile %(email)s",
         "invite_sent_to_email_room": "Kutse %(roomName)s jututuppa saadeti %(email)s e-posti aadressile",
         "invite_subtitle": "<userName/> saatis sulle kutse",
@@ -2067,6 +2088,7 @@
             },
             "uploading_single_file": "Laadin üles %(filename)s"
         },
+        "video_room": "See jututuba on mõeldud videokohtumiste jaoks",
         "waiting_for_join_subtitle": "Kui kutse saanud kasutajad on liitunud %(brand)s'ga, siis saad sa nendega suhelda ja jututuba on läbivalt krüptitud",
         "waiting_for_join_title": "Kasutajate liitumise ootel %(brand)s'ga"
     },
@@ -2075,30 +2097,80 @@
         "add_space_label": "Lisa kogukonnakeskus",
         "breadcrumbs_empty": "Hiljuti külastatud jututubasid ei leidu",
         "breadcrumbs_label": "Hiljuti külastatud jututoad",
+        "empty": {
+            "no_chats": "Vestlusi veel ei leidu",
+            "no_chats_description": "Alusta sellest, et leia mõni vestluspartner või loo oma jututuba",
+            "no_chats_description_no_room_rights": "Alusta sellest, et leia mõni vestluspartner",
+            "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_mentions": "Sul pole lugemata mainimisi",
+            "no_people": "Sul pole veel ühtegi otsevestlust kellegagi",
+            "no_people_description": "Kõikide muude vestluste nägemiseks eemalda otsingufiltrid",
+            "no_rooms": "Sa veel ei osale mitte üheski jututoas",
+            "no_rooms_description": "Kõikide oma muude vestluste nägemiseks eemalda otsingufiltrid",
+            "no_unread": "Õnnitlused! Sul pole ühtegi lugemata sõnumit",
+            "show_activity": "Vaata kõiki tegevusi",
+            "show_chats": "Näita kõiki vestlusi"
+        },
         "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",
+            "unread": "Lugemata"
+        },
         "home_menu_label": "Avalehe valikud",
         "join_public_room_label": "Liitu avaliku jututoaga",
         "joining_rooms_status": {
             "other": "Parasjagu liitun %(count)s jututoaga",
             "one": "Parasjagu liitun %(count)s jututoaga"
         },
+        "list_title": "Jututubade loend",
+        "more_options": {
+            "copy_link": "Kopeeri jututoa link",
+            "favourited": "Määratud lemmikuks",
+            "leave_room": "Lahku jututoast",
+            "low_priority": "Vähetähtis",
+            "mark_read": "Märgi loetuks",
+            "mark_unread": "Märgi mitteloetuks"
+        },
         "notification_options": "Teavituste eelistused",
+        "open_space_menu": "Ava kogukonna menüü",
+        "primary_filters": "Jututubade loendi filtrid",
         "redacting_messages_status": {
             "other": "Kustutame sõnumeid %(count)s jututoas",
             "one": "Kustutame sõnumeid %(count)s jututoas"
         },
+        "room": {
+            "more_options": "Täiendavad seadistused",
+            "open_room": "Ava jututuba: %(roomName)s"
+        },
+        "room_options": "Jututoa valikud",
         "show_less": "Näita vähem",
         "show_n_more": {
             "one": "Näita veel %(count)s vestlust",
             "other": "Näita veel %(count)s vestlust"
         },
         "show_previews": "Näita sõnumite eelvaateid",
+        "sort": "Järjesta",
         "sort_by": "Järjestamisviis",
         "sort_by_activity": "Aktiivsuse alusel",
         "sort_by_alphabet": "Tähestiku järjekorras",
+        "sort_type": {
+            "activity": "Aktiivsuse alusel",
+            "atoz": "Tähestiku alusel"
+        },
         "sort_unread_first": "Näita lugemata sõnumitega jututubasid esimesena",
+        "space_menu": {
+            "home": "Kogukonna avaleht",
+            "space_settings": "Kogukonna seadistused"
+        },
         "space_menu_label": "%(spaceName)s menüü",
         "sublist_options": "Loendi valikud",
         "suggested_rooms_heading": "Soovitatud jututoad"
@@ -2327,7 +2399,7 @@
             "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.",
-            "strict_encryption": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas",
+            "strict_encryption": "Saada sõnumeid vaid verifitseeritud kasutajatele.",
             "title": "Turvalisus ja privaatsus"
         },
         "title": "Jututoa seadistused - %(roomName)s",
@@ -2381,6 +2453,10 @@
         "recent_changes_heading": "Hiljutised muudatused, mis pole veel alla laetud või saabunud",
         "title": "Server ei vasta päringutele"
     },
+    "service_worker_error": {
+        "description": "Selleks, et autenditud meediafailide laadimine Matrixi sisuhoidlast toimiks, eeldab %(brand)s taustal toimiva teenuse töötleja kasutamist. See funktsionaalsus pole sinu veebibrauseris toetatud ja meediafailid võivad jääda laadimata.",
+        "title": "Teenuse töötleja laadimine ei õnnestunud"
+    },
     "seshat": {
         "error_initialising": "Sõnumite otsingu ettevalmistamine ei õnnestunud, lisateavet leiad <a>rakenduse seadistustest</a>",
         "reset_button": "Lähtesta sündmuste andmekogu",
@@ -2458,35 +2534,62 @@
                 "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_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.",
                 "details_title": "Krüptimise üksikasjad",
+                "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": "Vaikimisi ei saadeta krüptitud jututubadest sõnumeid verifitseerimata kasutajatele",
-                "other_people_device_label": "Ära iialgi saada krüptitud sõnumeid 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.",
+                "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",
+                "reset_in_progress": "Lähtestamine on töös...",
                 "session_id": "Sessiooni tunnus:",
                 "session_key": "Sessioonivõti:",
                 "title": "Täiendav teave"
             },
+            "confirm_key_storage_off": "Kas sa oled kindel, et tahad krüptovõtmete hoidlat mitte kasutada?",
+            "confirm_key_storage_off_description": "Kui sa logid välja kõikidest oma seadmetest, siis kaotad ligipääsu oma sõnumite ajaloole ning pead kõik olemasolevad kontaktid uuesti verifitseerima. <a>Lisateave</a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "Kustuta krüptovõtmete hoidla",
+                "confirm": "Kustuta krüptovõtmete hoidla",
+                "description": "Krüptovõtmete hoidla hoidla kustutamisega eemaldad serverist oma krüptoidentiteedi ja sõnumite võtmed ning lülitad välja järgnevad turvalisusega seotud funktsionaalsused:",
+                "list_first": "Sa ei saa uutes seadmetes lugeda varasemaid krüptitud sõnumeid",
+                "list_second": "Kui logid kõikjal %(brand)s rakendusest välja, siis kaotad ligipääsu kõikidele oma krüptitud sõnumitele",
+                "title": "Kas sa oled kindel, et soovid krüptovõtmete hoidla välja lülitada ning seejärel kustutada?"
+            },
             "device_not_verified_button": "Verifitseeri see seade",
             "device_not_verified_description": "Oma krüptoseadistuste nägemiseks palun verifitseeri see seade.",
             "device_not_verified_title": "Seade on verifitseerimata",
             "dialog_title": "<strong>Seadistused:</strong>Krüptimine",
+            "key_storage": {
+                "allow_key_storage": "Kasuta krüptovõtmete hoidlat",
+                "description": "Hoia oma krüptoidentiteeti ja sõnumite krüptovõtmeid turvaliselt serveris. See võimaldab sul lugeda oma varasemaid sõnumeid kõikides uutes seadmetes. <a>Lisateave</a>",
+                "title": "Krüptovõtmete hoidla"
+            },
             "recovery": {
+                "change_recovery_confirm_button": "Korda uut taastevõtit",
                 "change_recovery_confirm_description": "Toimingu lõpetamiseks palun sisesta alljärgnevalt oma uus taastevõti. Senine taastevõti enam ei toimi.",
+                "change_recovery_confirm_title": "Sisesta oma uus taastevõti",
+                "change_recovery_key": "Muuda taastevõtit",
                 "change_recovery_key_description": "Palun salvesta see taastevõti turvalisel viisil. Muutuse kinnitamiseks klõpsi „Jätka“.",
                 "change_recovery_key_title": "Kas muudame taastevõtit?",
                 "description": "Kui sa oled kaotanud ligipääsu kõikidele oma olemasolevatele seadmetele, siis sa saad taastevõtme abil taastada ligipääsu oma krüptoidentiteedile ja sõnumite ajaloole.",
                 "enter_key_error": "Sinu sisestatud taastevõti pole korrektne.",
-                "key_storage_warning": "Sinu võtmehoidla pole sünkroonis. Vea parandamiseks palun klõpsi järgnevat nuppu.",
+                "enter_recovery_key": "Sisesta taastevõti",
+                "forgot_recovery_key": "Kas unustasid taastevõtme?",
+                "key_storage_warning": "Sinu võtmehoidla pole sünkroonis. Vea parandamiseks palun klõpsi ühte järgnevatest nuppudest.",
                 "save_key_description": "Ära jaga seda mitte kellegagi!",
+                "save_key_title": "Taastevõti",
                 "set_up_recovery": "Seadista taastamine",
                 "set_up_recovery_confirm_button": "Lõpeta seadistamine",
                 "set_up_recovery_confirm_description": "Taastamise seadistamise lõpetamiseks palun sisesta eelmises vaates näidatud taastevõti.",
+                "set_up_recovery_confirm_title": "Kinnitamiseks sisesta oma taastevõti",
                 "set_up_recovery_description": "Sinu krüptovõtmete hoidlat kaitseb taastevõti. Kui peale seadistamist peaksid vajama uut taastevõtit, siis saad ta uuesti luua valikust „%(changeRecoveryKeyButton)s“.",
                 "set_up_recovery_save_key_description": "Palun märgi see taastevõti üles ja hoia teda turvaliselt, näiteks digitaalses salasõnalaekas, krüptitud märkmetes või vana kooli seifis.",
+                "set_up_recovery_save_key_title": "Salvesta oma taastevõti turvalisel viisil",
                 "set_up_recovery_secondary_description": "Kui klõpsid nuppu „Jätka“, loome me sulle uue taastevõtme.",
                 "title": "Taastamine"
             },
@@ -2534,6 +2637,7 @@
             "discovery_needs_terms_title": "Võimalda teistel Matrixi võrgu kasutajatel sind leida",
             "display_name": "Kuvatav nimi",
             "display_name_error": "Kuvatava nime määramine ei õnnestu",
+            "email_adding_unsupported_by_hs": "See koduserver ei toeta kasutajakonto juurde e-posti aadressi lisamise võimalust.",
             "email_address_in_use": "See e-posti aadress on juba kasutusel",
             "email_address_label": "E-posti aadress",
             "email_not_verified": "Sinu e-posti aadress pole veel verifitseeritud",
@@ -2558,7 +2662,9 @@
             "error_share_msisdn_discovery": "Telefoninumbri jagamine ei õnnestunud",
             "identity_server_no_token": "Ei leidu tunnusluba isikutuvastusserveri jaoks",
             "identity_server_not_set": "Isikutuvastusserver on määramata",
+            "invalid_phone_number": "Sisestatud telefoninumber ei tundu olema korrektne",
             "language_section": "Keel",
+            "msisdn_adding_unsupported_by_hs": "See koduserver ei toeta kasutajakonto juurde telefoninumbri lisamise võimalust.",
             "msisdn_in_use": "See telefoninumber on juba kasutusel",
             "msisdn_label": "Telefoninumber",
             "msisdn_verification_field_label": "Verifikatsioonikood",
@@ -2577,7 +2683,6 @@
             "unable_to_load_msisdns": "Telefoninumbrite laadimine ei õnnestu",
             "username": "Kasutajanimi"
         },
-        "image_thumbnails": "Näita piltide eelvaateid või väikepilte",
         "inline_url_previews_default": "Luba URL'ide vaikimisi eelvaated",
         "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)",
@@ -2599,21 +2704,21 @@
                 "enter_phrase_description": "Andmete kaitsmiseks sisesta turvafraas, mida vaid sina tead. Ole mõistlik ja palun ära kasuta selleks oma tavalist konto salasõna.",
                 "enter_phrase_title": "Sisesta turvafraas",
                 "enter_phrase_to_confirm": "Kinnitamiseks palun sisesta turvafraas teist korda.",
-                "generate_security_key_description": "Me loome turvavõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
-                "generate_security_key_title": "Loo turvavõti",
+                "generate_security_key_description": "Me loome taastevõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
+                "generate_security_key_title": "Loo taastevõti",
                 "pass_phrase_match_failed": "Ei klapi mitte.",
                 "pass_phrase_match_success": "Klapib!",
                 "phrase_strong_enough": "Suurepärane! Turvafraas on piisavalt kange.",
                 "secret_storage_query_failure": "Ei õnnestu tuvastada turvahoidla olekut",
-                "security_key_safety_reminder": "Kuna seda kasutatakse sinu krüptitud andmete kaitsmiseks, siis hoia oma turvavõtit kaitstud ja turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
+                "security_key_safety_reminder": "Kuna seda kasutatakse sinu krüptitud andmete kaitsmiseks, siis hoia oma taastevõtit kaitstud ja turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.",
                 "set_phrase_again": "Mine tagasi ja sisesta nad uuesti.",
                 "settings_reminder": "Samuti võid sa seadetes võtta kasutusse turvalise varunduse ning hallata oma krüptovõtmeid.",
                 "title_confirm_phrase": "Kinnita turvafraas",
-                "title_save_key": "Salvesta turvavõti",
+                "title_save_key": "Salvesta oma taastevõti",
                 "title_set_phrase": "Määra turvafraas",
                 "unable_to_setup": "Turvahoidla kasutuselevõtmine ei õnnestu",
                 "use_different_passphrase": "Kas kasutame muud paroolifraasi?",
-                "use_phrase_only_you_know": "Sisesta turvafraas, mida vaid sina tead ning lisaks võid salvestada varunduse turvavõtme."
+                "use_phrase_only_you_know": "Sisesta turvafraas, mida vaid sina tead ning lisaks võid salvestada varunduse taastevõtme."
             }
         },
         "key_export_import": {
@@ -2640,6 +2745,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Seadistused:</strong> Eiratud kasutajad"
         },
+        "media_preview": {
+            "hide_avatars": "Peida jututoa ja kutsuja tunnuspildid",
+            "hide_media": "Peida alati",
+            "media_preview_description": "Peidetud meediumi saad alati näha temal klõpsides",
+            "media_preview_label": "Näita ajajoonel meediat",
+            "show_in_private": "Privaatsetes jututubades",
+            "show_media": "Alati"
+        },
         "notifications": {
             "default_setting_description": "See seadistus kehtib vaikimisi kõikides sinu jututubades.",
             "default_setting_section": "Soovin teavitusi (vaikimisi seadistused)",
@@ -2725,57 +2838,20 @@
         "prompt_invite": "Hoiata enne kutse saatmist võimalikule vigasele Matrix'i kasutajatunnusele",
         "replace_plain_emoji": "Automaatelt asenda vormindamata tekst emotikoniga",
         "security": {
-            "4s_public_key_in_account_data": "kasutajakonto andmete hulgas",
-            "4s_public_key_status": "Turvahoidla avalik võti:",
             "analytics_description": "Vigade tuvastamiseks palun jaga meiega anonüümseid andmeid. Isiklikke andmeid me ei kogu ja kolmandad osapooled ei ole sellega seotud.",
-            "backup_key_cached_status": "Varukoopia võti on puhverdatud:",
-            "backup_key_stored_status": "Varukoopia võti on salvestatud:",
-            "backup_key_unexpected_type": "tundmatut tüüpi",
-            "backup_key_well_formed": "korrektses vormingus",
-            "backup_keys_description": "Selleks puhuks, kui sa kaotad ligipääsu kõikidele oma sessioonidele, tee varukoopia oma krüptovõtmetest ja kasutajakonto seadistustest. Unikaalse turvavõtmega tagad selle, et sinu varukoopia on kaitstud.",
             "bulk_options_accept_all_invites": "Võta vastu kõik %(invitedRooms)s kutsed",
             "bulk_options_reject_all_invites": "Lükka tagasi kõik %(invitedRooms)s kutsed",
             "bulk_options_section": "Masstoimingute seadistused",
-            "cross_signing_cached": "on puhverdatud kohalikus seadmes",
-            "cross_signing_homeserver_support": "Koduserver on tugi sellele funktsionaalusele:",
-            "cross_signing_homeserver_support_exists": "olemas",
-            "cross_signing_in_4s": "turvahoidlas",
-            "cross_signing_in_memory": "on mälus",
-            "cross_signing_master_private_Key": "Üldine privaatvõti:",
-            "cross_signing_not_cached": "ei leidu kohalikus seadmes",
-            "cross_signing_not_found": "pole leitavad",
-            "cross_signing_not_in_4s": "ei leidunud turvahoidlas",
-            "cross_signing_not_stored": "ei ole salvestatud",
-            "cross_signing_private_keys": "Privaatvõtmed risttunnustamise jaoks:",
-            "cross_signing_public_keys": "Avalikud võtmed risttunnustamise jaoks:",
-            "cross_signing_self_signing_private_key": "Sinu privaatvõtmed:",
-            "cross_signing_user_signing_private_key": "Kasutaja privaatvõti:",
-            "cryptography_section": "Krüptimine",
             "dehydrated_device_description": "Võrguühenduseta seadme funktsionaalsus võimaldab saada krüptitud sõnumeid ka siis, kui sa pole ühtegi seadmesse sisse loginud",
             "dehydrated_device_enabled": "Võrguühenduseta seadme funktsionaalsus on sisse lülitatud",
-            "delete_backup": "Kustuta varukoopia",
-            "delete_backup_confirm_description": "Kas sa oled kindel? Kui sul muud varundust pole, siis kaotad ligipääsu oma krüptitud sõnumitele.",
             "dialog_title": "<strong>Seadistused:</strong> Turvalisus ja privaatsus",
             "e2ee_default_disabled_warning": "Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.",
             "enable_message_search": "Võta kasutusele sõnumite otsing krüptitud jututubades",
             "encryption_section": "Krüptimine",
-            "error_loading_key_backup_status": "Võtmete varunduse oleku laadimine ei õnnestunud",
-            "export_megolm_keys": "Ekspordi jututubade läbiva krüptimise võtmed",
             "ignore_users_empty": "Sa ei ole veel kedagi eiranud.",
             "ignore_users_section": "Eiratud kasutajad",
-            "import_megolm_keys": "Impordi E2E läbiva krüptimise võtmed jututubade jaoks",
-            "key_backup_active": "See sessioon varundab sinu krüptovõtmeid.",
-            "key_backup_active_version": "Aktiivse varukoopia versioon:",
-            "key_backup_active_version_none": "Ei ühelgi juhul",
             "key_backup_algorithm": "Algoritm:",
-            "key_backup_can_be_restored": "Seda varukoopiat saab sellesse sessiooni taastada",
-            "key_backup_complete": "Kõik krüptovõtmed on varundatud",
             "key_backup_connect": "Seo see sessioon krüptovõtmete varundusega",
-            "key_backup_connect_prompt": "Enne väljalogimist seo see sessioon krüptovõtmete varundusega. Kui sa seda ei tee, siis võid kaotada võtmed, mida kasutatakse vaid siin sessioonis.",
-            "key_backup_in_progress": "Varundan %(sessionsRemaining)s krüptovõtmeid…",
-            "key_backup_inactive": "See sessioon <b>ei varunda sinu krüptovõtmeid</b>, aga sul on olemas varundus, millest saad taastada ning millele saad võtmeid lisada.",
-            "key_backup_inactive_warning": "Sinu selle sessiooni krüptovõtmeid <b>ei varundata</b>.",
-            "key_backup_latest_version": "Serveris leiduv viimane varukoopia:",
             "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": {
@@ -2795,14 +2871,8 @@
             "message_search_unsupported": "%(brand)s'is on puudu need komponendid, mis võimaldavad otsida kohalikest turvaliselt puhverdatud krüptitud sõnumitest. Kui sa tahaksid sellist funktsionaalsust katsetada, siis pead kompileerima %(brand)s'i variandi, kus <nativeLink>need komponendid on lisatud</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s ei võimalda veebibrauseris töötades krüptitud sõnumeid turvaliselt puhverdada. Selleks, et krüptitud sõnumeid saaks otsida, kasuta <desktopLink>%(brand)s Desktop</desktopLink> rakendust Matrix'i kliendina.",
             "record_session_details": "Sessioonide paremaks tuvastamiseks saad nüüd sessioonihalduris salvestada klientrakenduse nime, versiooni ja aadressi",
-            "restore_key_backup": "Taasta varukoopiast",
-            "secret_storage_not_ready": "ei ole valmis",
-            "secret_storage_ready": "valmis",
-            "secret_storage_status": "Turvahoidla:",
             "send_analytics": "Saada arendajatele analüütikat",
-            "session_id": "Sessiooni tunnus:",
-            "session_key": "Sessiooni võti:",
-            "strict_encryption": "Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse"
+            "strict_encryption": "Saada sõnumeid vaid verifitseeritud kasutajatele"
         },
         "send_read_receipts": "Saada lugemisteatiseid",
         "send_read_receipts_unsupported": "Sinu koduserver ei võimalda lugemisteatiste keelamist.",
@@ -3044,8 +3114,6 @@
         "topic": "Otsib või määrab jututoa teema",
         "topic_none": "Sellel jututoal puudub teema.",
         "topic_room_error": "Jututoa teema laadimine ei õnnestu: jututuba ei õnnestu leida (%(roomId)s)",
-        "tovirtual": "Kui jututoal on virtuaalne olek, siis kasuta seda",
-        "tovirtual_not_found": "Sellel jututoal pole virtuaalset olekut",
         "unban": "Taasta ligipääs antud tunnusega kasutajale",
         "unflip": "Lisab vormindamata sõnumi ette ┬──┬ ノ( ゜-゜ノ)",
         "unholdcall": "Võtab selles jututoas ootel oleva kõne",
@@ -3063,6 +3131,7 @@
         "view": "Vaata sellise aadressiga jututuba",
         "whois": "Näitab teavet kasutaja kohta"
     },
+    "sliding_sync_legacy_no_longer_supported": "Järkjärgulise sünkroniseerimise (Sliding sync) varasem lahendus pole enam toetatud: uue lahenduse kasutamiseks palun logi rakendusest välja ja uuesti sisse",
     "space": {
         "add_existing_room_space": {
             "create": "Kas sa selle asemel soovid lisada jututuba?",
@@ -3167,7 +3236,7 @@
         "heading_without_query": "Otsingusõna",
         "join_button_text": "Liitu %(roomAddress)s jututoaga",
         "keyboard_scroll_hint": "Kerimiseks kasuta <arrows/>",
-        "message_search_section_title": "Muud otsingud",
+        "messages_label": "Sõnumid",
         "other_rooms_in_space": "Muud jututoad %(spaceName)s kogukonnad",
         "public_rooms_label": "Avalikud jututoad",
         "public_spaces_label": "Avalikud kogukonnad",
@@ -3177,7 +3246,6 @@
         "result_may_be_hidden_privacy_warning": "Mõned tulemused võivad privaatsusseadistuste tõttu olla peidetud",
         "result_may_be_hidden_warning": "Mõned tulemused võivad olla peidetud",
         "search_dialog": "Otsinguvaade",
-        "search_messages_hint": "Sõnumite otsimiseks klõpsi <icon/> ikooni jututoa ülaosas",
         "spaces_title": "Kogukonnad, mille liige sa oled",
         "start_group_chat_button": "Alusta rühmavestlust"
     },
@@ -3226,9 +3294,7 @@
     "threads_activity_centre": {
         "header": "Jutulõngade ülevaade",
         "no_rooms_with_threads_notifs": "Pole veel ühtegi jutulõngakohase teavitusega jututuba.",
-        "no_rooms_with_unread_threads": "Pole veel ühtegi lugemata jutulõngaga jututuba.",
-        "release_announcement_description": "Jutulõngade teavitused leiduvad nüüd uues kohas. Nüüd leiad nad siit.",
-        "release_announcement_header": "Jutulõngade ülevaade"
+        "no_rooms_with_unread_threads": "Pole veel ühtegi lugemata jutulõngaga jututuba."
     },
     "time": {
         "about_day_ago": "umbes päev tagasi",
@@ -3276,7 +3342,7 @@
             "historical_event_no_key_backup": "Varasemad sõnumid pole selles seadmes loetavad",
             "historical_event_unverified_device": "Varasemate sõnumite nägemiseks pead selle seadme verifitseerima",
             "historical_event_user_not_joined": "Sul puudub ligipääs sellele sõnumile",
-            "sender_identity_previously_verified": "Verifitseeritud võrguidentiteet on muutunud",
+            "sender_identity_previously_verified": "Saatja verifitseeritud võrguidentiteet on lähtestatud",
             "sender_unsigned_device": "Krüptitud seadme poolt, mida tema omanik pole verifitseerinud.",
             "unable_to_decrypt": "Sõnumi dekrüptimine ei õnnestu"
         },
@@ -3440,6 +3506,7 @@
             "left_reason": "%(targetName)s lahkus jututoast: %(reason)s",
             "no_change": "%(senderName)s ei teinud muutusi",
             "reject_invite": "%(targetName)s lükkas kutse tagasi",
+            "reject_invite_reason": "%(targetName)s lükkas kutse tagasi: %(reason)s",
             "remove_avatar": "%(senderName)s eemaldas oma profiilipildi",
             "remove_name": "%(senderName)s eemaldas oma kuvatava nime (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s määras oma profiilipildi",
@@ -3476,11 +3543,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s uuendas seda jututuba.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s muutis uueks teemaks „%(topic)s“."
+            "changed": "%(senderDisplayName)s muutis uueks teemaks „%(topic)s“.",
+            "removed": "%(senderDisplayName)s eemaldas teema."
         },
         "m.sticker": "%(senderDisplayName)s saatis kleepsu.",
         "m.video": {
-            "error_decrypting": "Viga videovoo dekrüptimisel"
+            "error_decrypting": "Viga videovoo dekrüptimisel",
+            "show_video": "Näita videot"
         },
         "m.widget": {
             "added": "%(senderName)s lisas vidina %(widgetName)s",
@@ -3736,10 +3805,11 @@
         "unavailable": "Ei ole saadaval"
     },
     "update_room_access_modal": {
-        "description": "Osalemiseks mõeldud lingi loomiseks on vaja, et külalised saavad selle jututoaga liituda. See aga võib muuta jututoa vähem turvaliseks. Kui sa oled aga kõne lõpetanud, siis saad soovi korral jututoa uuesti muuta privaatseks.",
-        "dont_change_description": "Teise võimalusena saad helistada eraldi jututoas",
+        "description": "Kui soovid luua jagatavat linki, siis pead selle jututoa tegema <b>avalikuks</b> või pead seadistustest lubama huvilistel <b>paluda võimalust liitumiseks</b>. See võimaldab külalistel liituda ilma kutseta.",
+        "dont_change_description": "Kui sa ei soovi selle jututoa ligipääsuõigusi muuta, siis teise võimalusena saad helistamiseks luua eraldi jututoa",
         "no_change": "Ma ei soovi muuta õigusi jututoas.",
-        "title": "Muuda õigusi jututoas"
+        "revert_access_description": "(Eelmise väärtuse saad taastada jututoa seadistustest: <b>Turvalisus & Privaatsus</b> / <b>Ligipääs</b>)",
+        "title": "Luba külalistel selle jututoaga liituda"
     },
     "upload_failed_generic": "Faili '%(fileName)s' üleslaadimine ei õnnestunud.",
     "upload_failed_size": "Faili '%(fileName)s' suurus ületab serveris seadistatud üleslaadimise piiri",
@@ -3825,6 +3895,7 @@
         "unban_space_specific": "Eemalda kasutajalt suhtluskeeld valitud kohtadest, kust ma saan",
         "unban_space_warning": "Kasutaja ei saa ligi kohtadele, kus sul pole peakasutaja õigusi.",
         "unignore_button": "Lõpeta eiramine",
+        "verification_unavailable": "Kasutaja verifitseerimine pole saadaval",
         "verify_button": "Verifitseeri kasutaja",
         "verify_explainer": "Lisaturvalisus mõttes verifitseeri see kasutaja võrreldes selleks üheks korraks loodud koodi mõlemas seadmes."
     },
@@ -4031,7 +4102,7 @@
         "error_need_to_be_logged_in": "Sa peaksid olema sisse loginud.",
         "error_unable_start_audio_stream_description": "Audiovoo käivitamine ei õnnestu.",
         "error_unable_start_audio_stream_title": "Videovoo käivitamine ei õnnestu",
-        "modal_data_warning": "Andmeid selles vaates jagatakse %(widgetDomain)s serveriga",
+        "modal_data_warning": "Alljärgnevaid andmeid jagatakse %(widgetDomain)s serveriga",
         "modal_title_default": "Modaalne vidin",
         "no_name": "Tundmatu rakendus",
         "open_id_permissions_dialog": {
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
index 3b93b0ba92..7b375d4db0 100644
--- a/src/i18n/strings/fa.json
+++ b/src/i18n/strings/fa.json
@@ -73,7 +73,6 @@
         "react": "واکنش",
         "refresh": "رفرش",
         "register": "ایجاد حساب کاربری",
-        "reject": "پس زدن",
         "reload": "بارگذاری مجدد",
         "remove": "حذف کن",
         "rename": "تغییر نام",
@@ -335,7 +334,6 @@
         "camera": "دوربین",
         "copied": "رونوشت گرفته شد!",
         "credits": "اعتبارها",
-        "cross_signing": "امضاء متقابل",
         "dark": "تاریک",
         "description": "توضیحات",
         "edited": "ویرایش شده",
@@ -559,42 +557,23 @@
     "empty_room_was_name": "اتاق خالی (نام قبلی: %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "عبارت امنیتی خود را وارد کنید و یا <button>کلید امنیتی خود را استفاده کنید</button>.",
             "key_validation_text": {
-                "invalid_security_key": "کلید امنیتی نامعتبر است",
-                "recovery_key_is_correct": "به نظر خوب میاد!",
-                "wrong_file_type": "نوع فایل اشتباه است",
                 "wrong_security_key": "کلید امنیتی اشتباه است"
             },
-            "reset_title": "همه چیز را بازراه‌اندازی (reset) کنید",
-            "reset_warning_1": "این کار را فقط درصورتی انجام دهید که دستگاه دیگری برای تکمیل فرآیند تأیید ندارید.",
-            "reset_warning_2": "اگر همه موارد را بازراه‌اندازی (reset) کنید، دیگر هیچ نشست تائید شده‌ای و هیچ کاربر تائيد‌ شده‌ای نخواهید داشت و ممکن است نتوانید پیام‌های گذشته‌ی خود را مشاهده نمائید.",
             "restoring": "بازیابی کلیدها از نسخه پشتیبان",
-            "security_key_title": "کلید امنیتی",
-            "security_phrase_incorrect_error": "دسترسی به حافظه نهان امکان‌پذیر نیست. لطفاً تأیید کنید که عبارت امنیتی صحیح را وارد کرده‌اید.",
-            "security_phrase_title": "عبارت امنیتی",
-            "use_security_key_prompt": "برای ادامه از کلید امنیتی خود استفاده کنید."
+            "security_key_title": "کلید امنیتی"
         },
         "bootstrap_title": "تنظیم کلیدها",
         "cancel_entering_passphrase_description": "آیا مطمئن هستید که می خواهید وارد کردن عبارت امنیتی را لغو کنید؟",
         "cancel_entering_passphrase_title": "وارد کردن عبارت امنیتی لغو شود؟",
         "confirm_encryption_setup_body": "برای تأیید و فعال‌سازی رمزگذاری ، روی دکمه زیر کلیک کنید.",
         "confirm_encryption_setup_title": "راه‌اندازی رمزگذاری را تأیید کنید",
-        "cross_signing_not_ready": "امضاء متقابل تنظیم نشده‌است.",
-        "cross_signing_ready": "امضاء متقابل برای استفاده در دسترس است.",
         "cross_signing_room_normal": "این اتاق به صورت سرتاسر رمزشده است",
         "cross_signing_room_verified": "همه‌ی اعضای این اتاق تائید شده‌اند",
         "cross_signing_room_warning": "فردی از یک نشست ناشناس استفاده می‌کند",
-        "cross_signing_unsupported": "سرور شما امضاء متقابل را پشتیبانی نمی‌کند.",
-        "cross_signing_untrusted": "حساب کاربری شما یک هویت برای امضاء متقابل در حافظه‌ی نهان دارد، اما این هویت هنوز توسط این نشست تائید نشده‌است.",
         "cross_signing_user_normal": "شما این کاربر را تائید نکرده‌اید.",
         "cross_signing_user_verified": "شما این کاربر را تائید کرده‌اید. این کاربر تمام نشست‌های خود را تائيد کرده‌است.",
         "cross_signing_user_warning": "این کاربر هیچ‌کدام از نشست‌های خود را تائید نکرده است.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "کلیدهای امضای متقابل را پاک کن",
-            "title": "کلیدهای امضای متقابل نابود شود؟",
-            "warning": "حذف کلیدهای امضای متقابل دائمی است. هرکسی که او را تائید کرده‌باشید، هشدارهای امنیتی را مشاهده خواهد کرد. به احتمال زیاد نمی‌خواهید این کار را انجام دهید ، مگر هیچ دستگاهی برای امضاء متقابل از طریق آن نداشته باشید."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "صحت این پیام رمزگذاری شده در این دستگاه تضمین نمی شود.",
         "event_shield_reason_mismatched_sender_key": "توسط یک نشست تأیید نشده رمزگذاری شده است",
         "export_unsupported": "مرورگر شما از افزونه‌های رمزنگاری مورد نیاز پشتیبانی نمی‌کند",
@@ -611,7 +590,6 @@
             "title": "روش بازیابی جدید",
             "warning": "اگر روش بازیابی جدیدی را تنظیم نکرده‌اید، ممکن است حمله‌کننده‌ای تلاش کند به حساب کاربری شما دسترسی پیدا کند. لطفا گذرواژه حساب کاربری خود را تغییر داده و فورا یک روش جدیدِ بازیابی در بخش تنظیمات انتخاب کنید."
         },
-        "not_supported": "<پشتیبانی نمی‌شود>",
         "recovery_method_removed": {
             "description_1": "نشست فعلی تشخیص داده که عبارت امنیتی و کلید لازم شما برای پیام‌رسانی امن حذف شده‌است.",
             "description_2": "اگر این کار را به صورت تصادفی انجام دادید، می‌توانید سازوکار پیام امن را برای این نشست تنظیم کرده که باعث می‌شود تمام تاریخچه‌ی این نشست با استفاده از یک روش جدیدِ بازیابی، مجددا رمزشود.",
@@ -622,8 +600,7 @@
         "set_up_toast_description": "محافظ در برابر از دست‌دادن داده‌ها و پیام‌های رمزشده",
         "set_up_toast_title": "پشتیبان‌گیری امن را انجام دهید",
         "setup_secure_backup": {
-            "explainer": "پیش از خروج از حساب کاربری، از کلید‌های خود پشتیبان بگیرید تا آن‌ها را از دست ندهید.",
-            "title": "برپایی"
+            "explainer": "پیش از خروج از حساب کاربری، از کلید‌های خود پشتیبان بگیرید تا آن‌ها را از دست ندهید."
         },
         "udd": {
             "other_ask_verify_text": "از این کاربر بخواهید نشست خود را تأیید کرده و یا آن را به صورت دستی تأیید کنید.",
@@ -723,11 +700,7 @@
     "error_database_closed_title": "پایگاه داده به طور غیرمنتظره ای بسته شد",
     "error_dialog": {
         "error_loading_user_profile": "امکان نمایش پروفایل کاربر میسر نیست",
-        "forget_room_failed": "فراموش کردن اتاق با خطا مواجه شد %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "سرور ممکن است در دسترس نباشد ، بار زیادی روی آن قرار گرفته یا زمان جستجو به پایان رسیده‌باشد :(",
-            "title": "جستجو موفیت‌آمیز نبود"
-        }
+        "forget_room_failed": "فراموش کردن اتاق با خطا مواجه شد %(errCode)s"
     },
     "error_user_not_logged_in": "کاربر وارد نشده است",
     "event_preview": {
@@ -1113,11 +1086,6 @@
         "ongoing": "در حال حذف…",
         "reason_label": "دلیل (اختیاری)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "آیا مطمئن هستید که می خواهید دعوت را رد کنید؟",
-        "failed": "رد دعوتنامه موفقیت‌آمیز نبود",
-        "title": "ردکردن دعوت"
-    },
     "report_content": {
         "description": "گزارش این پیام شناسه‌ی منحصر به فرد رخداد آن را برای مدیر سرور ارسال می‌کند. اگر پیام‌های این اتاق رمزشده باشند، مدیر سرور شما امکان خواندن متن آن پیام یا مشاهده‌ی عکس یا فایل‌های دیگر را نخواهد داشت.",
         "missing_reason": "لطفا توضیح دهید که چرا گزارش می‌دهید.",
@@ -1206,7 +1174,6 @@
             "you_created": "شما این اتاق را ایجاد کردید."
         },
         "invite_email_mismatch_suggestion": "برای دریافت مستقیم دعوت در %(brand)s این ایمیل را در تنظیمات به اشتراک بگذارید.",
-        "invite_reject_ignore": "رد کردن و نادیده گرفتن کاربر",
         "invite_sent_to_email_room": "این دعوت به %(roomName)s به %(email)s ارسال شد",
         "invite_subtitle": "<userName/> شما را دعوت کرد",
         "invite_this_room": "دعوت به این گپ",
@@ -1524,7 +1491,6 @@
             "remove_email_prompt": "%(email)s را پاک می‌کنید؟",
             "remove_msisdn_prompt": "%(phone)s را پاک می‌کنید؟"
         },
-        "image_thumbnails": "پیش‌نمایش تصاویر را نشان بده",
         "inline_url_previews_default": "فعال‌سازی پیش‌نمایش URL به صورت پیش‌فرض",
         "inline_url_previews_room": "امکان پیش‌نمایش URL را به صورت پیش‌فرض برای اعضای این اتاق فعال کن",
         "inline_url_previews_room_account": "فعال‌سازی پیش‌نمایش URL برای این اتاق (تنها شما را تحت تاثیر قرار می‌دهد)",
@@ -1605,48 +1571,16 @@
         "prompt_invite": "قبل از ارسال دعوت‌نامه برای کاربری که شناسه‌ی او احتمالا معتبر نیست، هشدا بده",
         "replace_plain_emoji": "متن ساده را به صورت خودکار با شکلک جایگزین کن",
         "security": {
-            "4s_public_key_in_account_data": "در داده‌های حساب کاربری",
-            "4s_public_key_status": "کلید عمومی حافظه نهان:",
-            "backup_key_cached_status": "کلید پشتیبان ذخیره شد:",
-            "backup_key_stored_status": "کلید پشتیبان ذخیره شد:",
-            "backup_key_unexpected_type": "تایپ (نوع) غیرمنتظره",
-            "backup_key_well_formed": "خوش‌ساخت",
-            "backup_keys_description": "در صورت از دست رفتن دسترسی به نشست‌هایتان، از کلیدهای رمزنگاری و داده‌های حساب کاربری خود نسخه‌ی پشتیبان تهیه نمائید. کلیدهای شما توسط کلید منحضر به فرد امنیتی (Security Key) امن خواهند ماند.",
             "bulk_options_accept_all_invites": "همه‌ی دعوت‌های %(invitedRooms)s را قبول کن",
             "bulk_options_reject_all_invites": "همه‌ی دعوت‌های %(invitedRooms)s را رد کن",
             "bulk_options_section": "گزینه‌های دسته‌جمعی",
-            "cross_signing_cached": "به صورت محلی کش شده‌است",
-            "cross_signing_homeserver_support": "قابلیت‌های پشتیبانی‌شده سمت سرور:",
-            "cross_signing_homeserver_support_exists": "وجود دارد",
-            "cross_signing_in_4s": "بر روی حافظه نهان",
-            "cross_signing_in_memory": "بر روی حافظه",
-            "cross_signing_master_private_Key": "شاه‌کلید خصوصی:",
-            "cross_signing_not_cached": "به صورت محلی یافت نشد",
-            "cross_signing_not_found": "یافت نشد",
-            "cross_signing_not_in_4s": "در حافظه یافت نشد",
-            "cross_signing_not_stored": "ذخیره نشد",
-            "cross_signing_private_keys": "کلیدهای خصوصی امضاء متقابل:",
-            "cross_signing_public_keys": "کلیدهای عمومی امضاء متقابل:",
-            "cross_signing_self_signing_private_key": "کلید خصوصی self-sign:",
-            "cross_signing_user_signing_private_key": "کلید امضاء خصوصی کاربر:",
-            "cryptography_section": "رمزنگاری",
-            "delete_backup": "پاک‌کردن نسخه پشتیبان (Backup)",
-            "delete_backup_confirm_description": "آیا اطمینان دارید؟ در صورتی که از کلیدهای شما به درستی پشتیبان‌گیری نشده باشد، تمام پیام‌های رمزشده‌ی خود را از دست خواهید داد.",
             "e2ee_default_disabled_warning": "مدیر سرور شما قابلیت رمزنگاری سرتاسر برای اتاق‌ها و گفتگوهای خصوصی را به صورت پیش‌فرض غیرفعال کرده‌است.",
             "enable_message_search": "فعال‌سازی قابلیت جستجو در اتاق‌های رمزشده",
             "encryption_section": "رمزنگاری",
-            "error_loading_key_backup_status": "امکان بارگیری و نمایش وضعیت کلید پشتیبان وجود ندارد",
-            "export_megolm_keys": "استخراج (Export) کلیدهای رمزنگاری اتاق‌ها",
             "ignore_users_empty": "شما هیچ کاربری را نادیده نگرفته‌اید.",
             "ignore_users_section": "کاربران نادیده‌گرفته‌شده",
-            "import_megolm_keys": "واردکردن کلیدهای رمزنگاری اتاق‌ها",
-            "key_backup_active_version_none": "هیچ‌کدام",
             "key_backup_algorithm": "الگوریتم:",
-            "key_backup_complete": "از همه کلیدها نسخه‌ی پشتیبان گرفته شد",
             "key_backup_connect": "این نشست را به کلید پشتیبان‌گیر متصل کن",
-            "key_backup_connect_prompt": "پیش از خروج از حساب کاربری، این نشست را به کلید پشتیبان‌گیر متصل نمائید. با این کار مانع از گم‌شدن کلیدهای که فقط بر روی این نشست وجود دارند می‌شوید.",
-            "key_backup_inactive": "این نشست <b>از کلیدهای شما پشتیبان‌گیری نمی‌کند</b>، با این حال شما یک نسخه‌ی پشتیبان موجود دارید که می‌توانید آن را بازیابی کنید.",
-            "key_backup_inactive_warning": "کلید‌های شما <b>از این نشست پشتیبان‌گیری نمی‌شود</b>.",
             "message_search_disable_warning": "اگر غیر فعال شود، پیام‌های اتاق‌های رمزشده در نتایج جستجوها نمایش داده نمی‌شوند.",
             "message_search_disabled": "پیام‌های رمزشده را به صورتی محلی و امن ذخیره کرده تا در نتایج جستجو ظاهر شوند.",
             "message_search_enabled": {
@@ -1665,13 +1599,7 @@
             "message_search_space_used": "فضای مصرفی:",
             "message_search_unsupported": "%(brand)s بعضی از مولفه‌های مورد نیاز برای ذخیره امن پیام‌های رمزشده به صورت محلی را ندارد. اگر تمایل به استفاده از این قابلیت دارید، یک نسخه‌ی دلخواه از %(brand)s با <nativeLink> مولفه‌های مورد نظر</nativeLink> بسازید.",
             "message_search_unsupported_web": "%(brand)s نمی‌تواند پیام‌های رمزشده را به شکل امن و به صورت محلی در هنگامی که مرورگر در حال فعالیت است ذخیره کند. از <desktopLink>%(brand)s نسخه‌ی دسکتاپ</desktopLink> برای نمایش پیام‌های رمزشده در نتایج جستجو استفاده نمائید.",
-            "restore_key_backup": "بازیابی از نسخه‌ی پشتیبان",
-            "secret_storage_not_ready": "آماده نیست",
-            "secret_storage_ready": "آماده",
-            "secret_storage_status": "حافظه نهان:",
             "send_analytics": "ارسال داده‌های تجزیه و تحلیلی",
-            "session_id": "شناسه‌ی نشست:",
-            "session_key": "کلید نشست:",
             "strict_encryption": "هرگز از این نشست، پیام‌های رمزشده را به نشست‌های تائید نشده ارسال مکن"
         },
         "send_typing_notifications": "ارسال اعلان «در حال نوشتن»",
@@ -1774,8 +1702,6 @@
         "topic": "موضوع اتاق را دریافت یا تنظیم می‌کند",
         "topic_none": "این اتاق هیچ موضوعی ندارد.",
         "topic_room_error": "خطا در دریافت عنوان اتاق: اتاق %(roomId)s یافت نشد",
-        "tovirtual": "جابجایی به اتاق مجازی این اتاق، اگر یکی وجود داشت",
-        "tovirtual_not_found": "اتاق مجازی برای این اتاق وجود ندارد",
         "unban": "رفع تحریم کاربر با شناسه‌ی مذکور",
         "unflip": "┬──┬ ノ (゜ - ゜ ノ) را به ابتدای یک پیام متنی ساده اضافه می‌کند",
         "unholdcall": "تماس را در اتاق فعلی خاموش نگه می دارد",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c18244cd74..366bd83467 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -12,6 +12,7 @@
             "one": "Yksi lukematon maininta."
         },
         "recent_rooms": "Viimeisimmät huoneet",
+        "room_n_unread_invite": "Avaa huoneen %(roomName)s kutsu.",
         "room_name": "Huone %(name)s",
         "room_status_bar": "Huoneen tilapalkki",
         "seek_bar_label": "Äänen siirtymispalkki",
@@ -90,20 +91,20 @@
         "open": "Avaa",
         "open_menu": "Avaa valikko",
         "pause": "Keskeytä",
-        "pin": "Nuppineula",
+        "pin": "Kiinnitä",
         "play": "Toista",
         "proceed": "Jatka",
         "quote": "Lainaa",
         "react": "Reagoi",
         "refresh": "Päivitä",
         "register": "Rekisteröidy",
-        "reject": "Hylkää",
         "reload": "Lataa uudelleen",
         "remove": "Poista",
         "rename": "Nimeä uudelleen",
         "reply": "Vastaa",
         "reply_in_thread": "Vastaa ketjuun",
         "report_content": "Ilmoita sisällöstä",
+        "report_room": "Ilmoita huoneesta",
         "resend": "Lähetä uudelleen",
         "reset": "Palauta alkutilaan",
         "resume": "Jatka",
@@ -263,7 +264,7 @@
             "error_other_device_already_signed_in": "Sinun ei tarvitse tehdä mitään muuta.",
             "error_other_device_already_signed_in_title": "Toinen laitteesi on jo kirjautunut sisään",
             "error_rate_limited": "Liikaa yrityksiä lyhyessä ajassa. Odota hetki, ennen kuin yrität uudelleen.",
-            "error_unexpected": "Tapahtui odottamaton virhe.",
+            "error_unexpected": "Tapahtui odottamaton virhe. Toisen laitteen yhdistämispyyntö on peruttu.",
             "error_unsupported_protocol": "Tämä laite ei tue kirjautumista toiseen laitteeseen QR-koodilla.",
             "error_unsupported_protocol_title": "Toinen laite ei ole yhteensopiva",
             "error_user_cancelled": "Kirjautuminen peruutettiin toisella laitteella.",
@@ -453,7 +454,6 @@
         "capabilities": "Kyvykkyydet",
         "copied": "Kopioitu!",
         "credits": "Maininnat",
-        "cross_signing": "Ristiinvarmennus",
         "dark": "Tumma",
         "description": "Kuvaus",
         "deselect_all": "Älä valitse mitään",
@@ -708,6 +708,9 @@
         "default_cover_photo": "<photo>Oletuskansikuva</photo> © <author>Jesús Roncero</author>, käytössä <terms>CC-BY-SA 4.0</terms>:n ehtojen mukaisesti.",
         "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."
+    },
     "desktop_default_device_name": "%(brand)sin työpöytäversio: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktiiviset sovelmat",
@@ -742,6 +745,7 @@
         "room_notifications_sender": "Lähettäjä: ",
         "room_notifications_total": "Yhteensä: ",
         "room_notifications_type": "Tyyppi: ",
+        "room_status": "Huoneen tila",
         "save_setting_values": "Tallenna asetusarvot",
         "server_info": "Palvelimen tiedot",
         "server_versions": "Palvelinversiot",
@@ -785,40 +789,24 @@
     "empty_room_was_name": "Tyhjä huone (oli %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Kirjoita turvalause tai <button>käytä turva-avain</button> jatkaaksesi.",
             "key_validation_text": {
-                "invalid_security_key": "Virheellinen turva-avain",
-                "recovery_key_is_correct": "Hyvältä näyttää!",
-                "wrong_file_type": "Väärä tiedostotyyppi",
-                "wrong_security_key": "Väärä turva-avain"
+                "wrong_security_key": "Väärä palautusavain"
             },
             "restoring": "Palautetaan avaimia varmuuskopiosta",
-            "security_key_title": "Turva-avain",
-            "security_phrase_title": "Turvalause",
-            "separator": "%(securityKey)s tai %(recoveryFile)s",
-            "use_security_key_prompt": "Käytä turva-avain jatkaaksesi."
+            "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_not_ready": "Ristiinvarmennusta ei ole asennettu.",
-        "cross_signing_ready": "Ristiinvarmennus on käyttövalmis.",
-        "cross_signing_ready_no_backup": "Ristiinvarmennus on valmis, mutta avaimia ei ole varmuuskopioitu.",
         "cross_signing_room_normal": "Tämä huone käyttää päästä päähän -salausta",
         "cross_signing_room_verified": "Kaikki tämän huoneen käyttäjät on varmennettu",
         "cross_signing_room_warning": "Joku käyttää tuntematonta istuntoa",
-        "cross_signing_unsupported": "Kotipalvelimesi ei tue ristiinvarmennusta.",
-        "cross_signing_untrusted": "Tililläsi on ristiinvarmennuksen identiteetti salaisessa tallennustilassa, mutta tämä istunto ei vielä luota siihen.",
         "cross_signing_user_normal": "Et ole varmentanut tätä käyttäjää.",
         "cross_signing_user_verified": "Olet varmentanut tämän käyttäjän. Tämä käyttäjä on varmentanut kaikki istuntonsa.",
         "cross_signing_user_warning": "Tämä käyttäjä ei ole varmentanut kaikkia istuntojaan.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Tyhjennä ristiinvarmennuksen avaimet",
-            "title": "Tuhoa ristiinvarmennuksen avaimet?",
-            "warning": "Ristiinvarmennuksen avainten tuhoamista ei voi kumota. Jokainen, jonka olet varmentanut, tulee näkemään turvallisuushälytyksiä. Et todennäköisesti halua tehdä tätä, ellet ole hukannut kaikkia laitteitasi, joista pystyit ristiinvarmentamaan."
-        },
+        "enter_recovery_key": "Kirjoita palautusavain",
         "event_shield_reason_authenticity_not_guaranteed": "Tämän salatun viestin aitoutta ei voida taata tällä laitteella.",
         "event_shield_reason_mismatched_sender_key": "Salattu varmentamattoman istunnon toimesta",
         "export_unsupported": "Selaimesi ei tue vaadittuja kryptografisia laajennuksia",
@@ -837,7 +825,6 @@
             "title": "Uusi palautustapa",
             "warning": "Jos et ottanut käyttöön uutta palautustapaa, hyökkääjä saattaa yrittää käyttää tiliäsi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi."
         },
-        "not_supported": "<ei tuettu>",
         "recovery_method_removed": {
             "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."
@@ -845,11 +832,11 @@
         "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.",
-            "title": "Ota käyttöön"
+            "explainer": "Varmuuskopioi avaimesi ennen kuin kirjaudut ulos välttääksesi avainten menetyksen."
         },
         "udd": {
             "interactive_verification_button": "Vahvista vuorovaikutteisesti emojilla",
@@ -979,11 +966,7 @@
             "title": "Huoneen linkin kopiointi ei onnistu"
         },
         "error_loading_user_profile": "Käyttäjäprofiilia ei voitu ladata",
-        "forget_room_failed": "Huoneen unohtaminen epäonnistui %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai haku kesti liian kauan :(",
-            "title": "Haku epäonnistui"
-        }
+        "forget_room_failed": "Huoneen unohtaminen epäonnistui %(errCode)s"
     },
     "error_user_not_logged_in": "Käyttäjä ei ole sisäänkirjautunut",
     "event_preview": {
@@ -1008,7 +991,8 @@
             "image": "Kuva",
             "poll": "Kysely",
             "video": "Video"
-        }
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
     },
     "export_chat": {
         "cancelled": "Vienti peruttu",
@@ -1050,9 +1034,11 @@
         "media_omitted": "Media jätetty pois",
         "media_omitted_file_size": "Media jätetty pois – tiedoston kokoraja ylitetty",
         "messages": "Viestit",
+        "next_page": "Seuraava viestiryhmä",
         "num_messages": "Viestien määrä",
         "num_messages_min_max": "Viestimäärän täytyy olla luku väliltä %(min)s…%(max)s",
         "number_of_messages": "Määritä viestien lukumäärä",
+        "previous_page": "Edellinen viestiryhmä",
         "processing": "Käsitellään…",
         "processing_event_n": "Käsitellään tapahtumaa %(number)s / %(total)s",
         "size_limit": "Kokoraja",
@@ -1325,7 +1311,7 @@
         "sliding_sync": "Liukuvan synkronoinnin tila",
         "sliding_sync_description": "Työn alla, käytöstä poistaminen ei ole mahdollista.",
         "sliding_sync_disabled_notice": "Poista käytöstä kirjautumalla ulos ja takaisin sisään",
-        "sliding_sync_server_no_support": "Palvelimellasi ei ole natiivitukea",
+        "sliding_sync_server_no_support": "Palvelimellasi ei ole tukea",
         "under_active_development": "Aktiivisen kehityksen kohteena.",
         "video_rooms": "Videohuoneet",
         "video_rooms_a_new_way_to_chat": "Uusi tapa keskustella äänen ja videon välityksellä %(brand)sissä.",
@@ -1427,6 +1413,7 @@
         "toast_description": "%(brand)s on mobiiliselaimissa kokeellinen. Paremman kokemuksen ja uusimmat ominaisuudet saat ilmaisella mobiilisovelluksellamme.",
         "toast_title": "Parempi kokemus sovelluksella"
     },
+    "name_and_id": "%(name)s (%(userId)s)",
     "no_more_results": "Ei enempää tuloksia",
     "notif_panel": {
         "empty_description": "Sinulla ei ole näkyviä ilmoituksia.",
@@ -1453,7 +1440,8 @@
         "mentions_and_keywords_description": "Vastaanota ilmoitukset maininnoista ja asiasanoista <a>asetuksissa</a> määrittämälläsi tavalla",
         "mentions_keywords": "Maininnat ja avainsanat",
         "message_didnt_send": "Viestiä ei lähetetty. Lisätietoa napsauttamalla.",
-        "mute_description": "Et saa ilmoituksia"
+        "mute_description": "Et saa ilmoituksia",
+        "mute_room": "Mykistä huone"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s pyytää varmennusta"
@@ -1547,15 +1535,11 @@
     },
     "redact": {
         "confirm_button": "Varmista poistaminen",
+        "confirm_description": "Haluatko varmasti poistaa tämän tapahtuman?",
         "error": "Et voi poistaa tätä viestiä. (%(code)s)",
         "ongoing": "Poistetaan…",
         "reason_label": "Syy (valinnainen)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Oletko varma että haluat hylätä kutsun?",
-        "failed": "Kutsun hylkääminen epäonnistui",
-        "title": "Hylkää kutsu"
-    },
     "report_content": {
         "description": "Tämän viestin ilmoittaminen lähettää sen yksilöllisen tapahtumatunnuksen (event ID) kotipalvelimesi ylläpitäjälle. Jos tämän huoneen viestit on salattu, kotipalvelimesi ylläpitäjä ei voi lukea viestin tekstiä tai nähdä tiedostoja tai kuvia.",
         "ignore_user": "Sivuuta käyttäjä",
@@ -1567,6 +1551,9 @@
         "spam_or_propaganda": "Roskapostitusta tai propagandaa",
         "toxic_behaviour": "Myrkyllinen käyttäytyminen"
     },
+    "report_room": {
+        "reason_label": "Kuvaile syy"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "%(failedCount)s istunnon purkaminen epäonnistui!",
         "count_of_successfully_restored_keys": "%(sessionCount)s avaimen palautus onnistui",
@@ -1591,6 +1578,7 @@
         "extensions_empty_title": "Paranna tuottavuutta työkaluilla, widgeteillä ja boteilla",
         "files_button": "Tiedostot",
         "pinned_messages": {
+            "empty_title": "Kiinnitä tärkeät viestit, jotta ne löytyvät helposti",
             "header": {
                 "one": "1 kiinnitetty viesti",
                 "other": "%(count)s kiinnitettyä viestiä"
@@ -1721,7 +1709,6 @@
             "you_created": "Loit tämän huoneen."
         },
         "invite_email_mismatch_suggestion": "Jaa tämä sähköposti asetuksissa saadaksesi kutsuja suoraan %(brand)sissa.",
-        "invite_reject_ignore": "Hylkää ja sivuuta käyttäjä",
         "invite_sent_to_email": "Tämä kutsu lähetettiin osoitteeseen %(email)s",
         "invite_sent_to_email_room": "Tämä kutsu huoneeseen %(roomName)s lähetettiin sähköpostiosoitteeseen %(email)s",
         "invite_subtitle": "Kutsunut <userName/>",
@@ -1766,7 +1753,9 @@
         "pinned_message_badge": "Kiinnitetty viesti",
         "pinned_message_banner": {
             "button_view_all": "Näytä kaikki",
-            "description": "Tässä huoneessa on kiinnitettyjä viestejä. Napsauta nähdäksesi ne."
+            "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",
         "rejecting": "Hylätään kutsua…",
@@ -1808,7 +1797,8 @@
                 "other": "Lähetetään %(filename)s ja %(count)s muuta"
             },
             "uploading_single_file": "Lähetetään %(filename)s"
-        }
+        },
+        "video_room": "Tämä huone on videohuone"
     },
     "room_list": {
         "add_room_label": "Lisää huone",
@@ -1816,7 +1806,11 @@
         "breadcrumbs_empty": "Ei hiljattain vierailtuja huoneita",
         "breadcrumbs_label": "Hiljattain vieraillut huoneet",
         "empty": {
+            "no_chats": "Ei keskusteluja vielä",
+            "no_chats_description": "Aloita lähettämällä viestejä jollekin henkilölle tai luomalla huone",
+            "no_chats_description_no_room_rights": "Aloita lähettämällä viesti jollekin",
             "no_favourites": "Sinulla ei ole vielä suosikkikeskustelua",
+            "no_rooms": "Et ole vielä missään huoneessa",
             "no_unread": "Onnittelut! Sinulla ei ole lukemattomia viestejä",
             "show_chats": "Näytä kaikki keskustelut"
         },
@@ -1837,7 +1831,8 @@
         "more_options": {
             "copy_link": "Kopioi huoneen linkki",
             "leave_room": "Poistu huoneesta",
-            "mark_read": "Merkitse luetuksi"
+            "mark_read": "Merkitse luetuksi",
+            "mark_unread": "Merkitse lukemattomaksi"
         },
         "notification_options": "Ilmoitusasetukset",
         "open_space_menu": "Avaa avaruusvalikko",
@@ -1857,6 +1852,9 @@
         "sort_by": "Lajittelutapa",
         "sort_by_activity": "Aktiivisuus",
         "sort_by_alphabet": "A-Ö",
+        "sort_type": {
+            "atoz": "A-Ö"
+        },
         "sort_unread_first": "Näytä ensimmäisenä huoneet, joissa on lukemattomia viestejä",
         "space_menu": {
             "space_settings": "Avaruuden asetukset"
@@ -2074,8 +2072,9 @@
             },
             "join_rule_upgrade_upgrading_room": "Päivitetään huonetta",
             "public_without_alias_warning": "Lisää osoite linkittääksesi tähän huoneeseen.",
+            "publish_room": "Aseta tämä huone näkyväksi julkisten huoneiden hakemistossa.",
             "publish_space": "Tee tämä avaruus näkyväksi julkisten huoneiden hakemistossa.",
-            "strict_encryption": "Älä lähetä salattuja viestejä vahvistamattomiin istuntoihin tässä huoneessa tässä istunnossa",
+            "strict_encryption": "Lähetä viestejä vain vahvistetuille käyttäjille.",
             "title": "Tietoturva ja yksityisyys"
         },
         "title": "Huoneen asetukset — %(roomName)s",
@@ -2186,6 +2185,7 @@
         "code_block_line_numbers": "Näytä rivinumerot koodilohkoissa",
         "emoji_autocomplete": "Näytä emoji-ehdotuksia kirjoittaessa",
         "enable_markdown": "Ota Markdown käyttöön",
+        "enable_markdown_description": "Aloita viestit kirjoittamalla <code>/plain</code> lähettääksesi ilman markdownia.",
         "encryption": {
             "advanced": {
                 "details_title": "Salauksen tiedot",
@@ -2199,14 +2199,20 @@
             "device_not_verified_title": "Laitetta ei ole vahvistettu",
             "dialog_title": "<strong>Asetukset:</strong> Salaus",
             "recovery": {
+                "change_recovery_confirm_button": "Vahvista uusi palautusavain",
                 "change_recovery_confirm_title": "Anna uusi palautusavain",
+                "change_recovery_key": "Vaihda palautusavain",
                 "change_recovery_key_title": "Vaihdetaanko palautusavain?",
                 "description": "Palauta kryptografinen identiteettisi ja viestihistoriasi palautusavaimella, jos olet kadottanut kaikki olemassa olevat laitteesi.",
                 "enter_key_error": "Kirjoittamasi palautusavain ei ole oikein.",
+                "enter_recovery_key": "Kirjoita palautusavain",
                 "forgot_recovery_key": "Unohditko palautusavaimen?",
                 "save_key_description": "Älä jaa tätä kenenkään kanssa!",
+                "save_key_title": "Palautusavain",
                 "set_up_recovery": "Määritä palautus",
                 "set_up_recovery_confirm_title": "Anna palautusavain vahvistaaksesi",
+                "set_up_recovery_save_key_title": "Tallenna palautusavain turvalliseen paikkaan",
+                "set_up_recovery_secondary_description": "Kun napsautat Jatka, sinulle luodaan palautusavain.",
                 "title": "Palautuminen"
             },
             "title": "Salaus"
@@ -2228,6 +2234,7 @@
             "avatar_remove_progress": "Poistetaan kuva...",
             "avatar_save_progress": "Lähetetään kuva…",
             "avatar_upload_error_text": "Tiedostomuoto ei ole tuettu tai kuva on suurempi kuin %(size)s.",
+            "avatar_upload_error_text_generic": "Tiedostomuotoa ei ehkä tueta.",
             "confirm_adding_email_body": "Napsauta alapuolella olevaa painiketta lisätäksesi tämän sähköpostiosoitteen.",
             "confirm_adding_email_title": "Vahvista sähköpostin lisääminen",
             "deactivate_confirm_body": "Haluatko varmasti poistaa tilisi pysyvästi?",
@@ -2249,6 +2256,7 @@
             "discovery_needs_terms_title": "Anna ihmisten löytää sinut",
             "display_name": "Näyttönimi",
             "display_name_error": "Näyttönimeä ei voi asettaa",
+            "email_adding_unsupported_by_hs": "Tämä kotipalvelin ei tue sähköpostiosoitteiden lisäämistä tiliisi.",
             "email_address_in_use": "Tämä sähköpostiosoite on jo käytössä",
             "email_address_label": "Sähköpostiosoite",
             "email_not_verified": "Sähköpostiosoitettasi ei ole vielä varmistettu",
@@ -2263,6 +2271,7 @@
             "error_invalid_email_detail": "Tämä ei vaikuta olevan kelvollinen sähköpostiosoite",
             "error_msisdn_verification": "Puhelinnumeron vahvistaminen epäonnistui.",
             "error_password_change_403": "Salasanan vaihtaminen epäonnistui. Onko salasanasi oikein?",
+            "error_password_change_http": "%(errorMessage)s (HTTP-tila %(httpStatus)s)",
             "error_password_change_title": "Virhe salasanan vaihtamisessa",
             "error_password_change_unknown": "Tuntematon salasananvaihtovirhe (%(stringifiedError)s)",
             "error_remove_3pid": "Yhteystietojen poistaminen epäonnistui",
@@ -2271,7 +2280,9 @@
             "error_share_email_discovery": "Sähköpostiosoitetta ei voi jakaa",
             "error_share_msisdn_discovery": "Puhelinnumeroa ei voi jakaa",
             "identity_server_not_set": "Identiteettipalvelinta ei ole asetettu",
+            "invalid_phone_number": "Annettu puhelinnumero ei vaikuta olevan kelvollinen.",
             "language_section": "Kieli",
+            "msisdn_adding_unsupported_by_hs": "Tämä kotipalvelin ei tue puhelinnumeroiden lisäämistä tilillesi.",
             "msisdn_in_use": "Puhelinnumero on jo käytössä",
             "msisdn_label": "Puhelinnumero",
             "msisdn_verification_field_label": "Varmennuskoodi",
@@ -2289,7 +2300,6 @@
             "unable_to_load_msisdns": "Puhelinnumeroita ei voi ladata",
             "username": "Käyttäjätunnus"
         },
-        "image_thumbnails": "Näytä kuvien esikatselut/pienoiskuvat",
         "inline_url_previews_default": "Ota linkkien esikatselu käyttöön oletusarvoisesti",
         "inline_url_previews_room": "Ota linkkien esikatselu käyttöön kaikille huoneen jäsenille",
         "inline_url_previews_room_account": "Ota linkkien esikatselut käyttöön tässä huoneessa (koskee ainoastaan sinua)",
@@ -2347,6 +2357,12 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Asetukset:</strong> Ohitetut käyttäjät"
         },
+        "media_preview": {
+            "hide_media": "Piilota aina",
+            "media_preview_description": "Piilotetun median voi aina näyttää napauttamalla sitä",
+            "media_preview_label": "Näytä media aikajanalla",
+            "show_media": "Näytä aina"
+        },
         "notifications": {
             "desktop_notification_message_preview": "Näytä viestin esikatselu työpöytäilmoituksessa",
             "dialog_title": "<strong>Asetukset:</strong> Ilmoitukset",
@@ -2411,47 +2427,18 @@
         "prompt_invite": "Kysy varmistus ennen kutsujen lähettämistä mahdollisesti epäkelpoihin Matrix ID:hin",
         "replace_plain_emoji": "Korvaa automaattisesti teksimuotoiset emojit",
         "security": {
-            "4s_public_key_in_account_data": "tilin tiedoissa",
-            "4s_public_key_status": "Salavaraston julkinen avain:",
             "analytics_description": "Jaa nimettömiä tietoja auttaaksesi meitä tunnistamaan ongelmia. Ei mitään henkilökohtaista. Ei kolmansia osapuolia.",
-            "backup_key_cached_status": "Välimuistissa oleva varmuuskopioavain:",
-            "backup_key_stored_status": "Varmuuskopioavain tallennettu:",
-            "backup_key_unexpected_type": "odottamaton tyyppi",
-            "backup_key_well_formed": "hyvin muotoiltu",
-            "backup_keys_description": "Varmuuskopioi salausavaimesi tilisi datan kanssa siltä varalta, että menetät pääsyn istuntoihisi. Avaimesi turvataan yksilöllisellä turva-avaimella.",
             "bulk_options_accept_all_invites": "Hyväksy kaikki %(invitedRooms)s kutsua",
             "bulk_options_reject_all_invites": "Hylkää kaikki %(invitedRooms)s kutsua",
             "bulk_options_section": "Massatoimintoasetukset",
-            "cross_signing_cached": "paikallisessa välimuistissa",
-            "cross_signing_homeserver_support": "Kotipalvelimen ominaisuuksien tuki:",
-            "cross_signing_homeserver_support_exists": "on olemassa",
-            "cross_signing_in_4s": "salavarastossa",
-            "cross_signing_in_memory": "muistissa",
-            "cross_signing_not_cached": "ei paikallisessa välimuistissa",
-            "cross_signing_not_found": "ei löydetty",
-            "cross_signing_not_in_4s": "ei löytynyt muistista",
-            "cross_signing_not_stored": "ei tallennettu",
-            "cross_signing_private_keys": "Ristiinvarmennuksen salaiset avaimet:",
-            "cross_signing_public_keys": "Ristiinvarmennuksen julkiset avaimet:",
-            "cryptography_section": "Salaus",
-            "delete_backup": "Poista varmuuskopio",
-            "delete_backup_confirm_description": "Oletko varma? Et voi lukea salattuja viestejäsi, mikäli avaimesi eivät ole kunnolla varmuuskopioituna.",
             "dialog_title": "<strong>Asetukset:</strong> Tietoturva ja yksityisyys",
             "e2ee_default_disabled_warning": "Palvelimesi ylläpitäjä on poistanut päästä päähän -salauksen oletuksena käytöstä yksityisissä huoneissa ja yksityisviesteissä.",
             "enable_message_search": "Ota viestihaku salausta käyttävissä huoneissa käyttöön",
             "encryption_section": "Salaus",
-            "error_loading_key_backup_status": "Avainten varmuuskopionnin tilan lukeminen epäonnistui",
-            "export_megolm_keys": "Tallenna osapuolten välisen salauksen huoneavaimet",
             "ignore_users_empty": "Et ole sivuuttanut käyttäjiä.",
             "ignore_users_section": "Sivuutetut käyttäjät",
-            "import_megolm_keys": "Tuo olemassaolevat osapuolten välisen salauksen huoneavaimet",
-            "key_backup_active_version_none": "Ei mitään",
             "key_backup_algorithm": "Algoritmi:",
-            "key_backup_complete": "Kaikki avaimet on varmuuskopioitu",
             "key_backup_connect": "Yhdistä tämä istunto avainten varmuuskopiointiin",
-            "key_backup_connect_prompt": "Yhdistä tämä istunto avainten varmuuskopiointiin ennen uloskirjautumista, jotta et menetä avaimia, jotka ovat vain tässä istunnossa.",
-            "key_backup_inactive": "Tämä istunto <b>ei varmuuskopioi avaimiasi</b>, mutta sillä on olemassaoleva varmuuskopio, jonka voit palauttaa ja lisätä jatkaaksesi.",
-            "key_backup_inactive_warning": "Avaimiasi <b>ei varmuuskopioida tästä istunnosta</b>.",
             "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": {
@@ -2470,13 +2457,7 @@
             "message_search_space_used": "Käytetty tila:",
             "message_search_unsupported": "%(brand)sissa ei ole joitain komponentteja, joita tarvitaan viestien turvalliseen välimuistitallennukseen. Jos haluat kokeilla tätä ominaisuutta, käännä mukautettu %(brand)s Desktop, jossa on mukana <nativeLink>hakukomponentit</nativeLink>.",
             "record_session_details": "Talleta asiakasohjelmiston nimi, versio ja URL-osoite tunnistaaksesi istunnot istuntohallinnassa",
-            "restore_key_backup": "Palauta varmuuskopiosta",
-            "secret_storage_not_ready": "ei valmis",
-            "secret_storage_ready": "valmis",
-            "secret_storage_status": "Salainen tallennus:",
             "send_analytics": "Lähetä analytiikkatietoja",
-            "session_id": "Istunnon tunnus:",
-            "session_key": "Istunnon avain:",
             "strict_encryption": "Älä koskaan lähetä salattuja viestejä vahvistamattomiin istuntoihin tästä istunnosta"
         },
         "send_read_receipts": "Lähetä lukukuittaukset",
@@ -2508,6 +2489,7 @@
             "device_verified_description": "Tämä istunto on valmis turvallista viestintää varten.",
             "device_verified_description_current": "Nykyinen istuntosi on valmis turvalliseen viestintään.",
             "dialog_title": "<strong>Asetukset:</strong> Istunnot",
+            "error_set_name": "Istunnon nimen asettaminen epäonnistui",
             "filter_all": "Kaikki",
             "filter_inactive": "Passiivinen",
             "filter_inactive_description": "Passiivinen %(inactiveAgeDays)s päivää tai pidempään",
@@ -2520,6 +2502,7 @@
             "inactive_sessions_list_description": "Harkitse vanhoista (%(inactiveAgeDays)s tai useamman päivän ikäisistä), käyttämättömistä istunnoista uloskirjautumista.",
             "ip": "IP-osoite",
             "last_activity": "Viimeisin toiminta",
+            "manage": "Hallitse tätä istuntoa",
             "mobile_session": "Mobiili-istunto",
             "n_sessions_selected": {
                 "one": "%(count)s istunto valittu",
@@ -2571,6 +2554,7 @@
             "verify_session": "Vahvista istunto",
             "web_session": "Web-istunto"
         },
+        "show_avatar_changes": "Näytä profiilikuvan muutokset",
         "show_breadcrumbs": "Näytä oikotiet viimeksi katsottuihin huoneisiin huoneluettelon yläpuolella",
         "show_chat_effects": "Näytä keskustelutehosteet (animaatiot, kun saat esim. konfettia)",
         "show_displayname_changes": "Näytä näyttönimien muutokset",
@@ -2699,8 +2683,6 @@
         "topic": "Hakee tai asettaa huoneen aiheen",
         "topic_none": "Tässä huoneessa ei ole aihetta.",
         "topic_room_error": "Huoneen aiheen hakeminen epäonnistui: huonetta (%(roomId)s ei löydy.",
-        "tovirtual": "Vaihtaa tämän huoneen virtuaalihuoneeseen, mikäli huoneella sellainen on",
-        "tovirtual_not_found": "Tällä huoneella ei ole virtuaalihuonetta",
         "unban": "Poistaa porttikiellon tunnuksen mukaiselta käyttäjältä",
         "unflip": "Lisää ┬──┬ ノ( ゜-゜ノ) viestin alkuun",
         "unholdcall": "Ottaa nykyisen huoneen puhelun pois pidosta",
@@ -2819,7 +2801,7 @@
         "heading_without_query": "Etsittävät kohteet",
         "join_button_text": "Liity %(roomAddress)s",
         "keyboard_scroll_hint": "Käytä <arrows/> vierittääksesi",
-        "message_search_section_title": "Muut haut",
+        "messages_label": "Viestit",
         "other_rooms_in_space": "Muut huoneet avaruudessa %(spaceName)s",
         "public_rooms_label": "Julkiset huoneet",
         "public_spaces_label": "Julkiset avaruudet",
@@ -2827,7 +2809,6 @@
         "recently_viewed_section_title": "Äskettäin katsottu",
         "result_may_be_hidden_privacy_warning": "Jotkin tulokset saatetaan piilottaa tietosuojan takia",
         "result_may_be_hidden_warning": "Jotkin tulokset saatetaan piilottaa",
-        "search_messages_hint": "Etsi viesteistä huoneen yläosassa olevalla kuvakkeella <icon/>",
         "spaces_title": "Avaruudet, joissa olet",
         "start_group_chat_button": "Aloita ryhmäkeskustelu"
     },
@@ -2914,9 +2895,11 @@
             "historical_event_user_not_joined": "Sinulla ei ole pääsyä tähän viestiin",
             "unable_to_decrypt": "Viestin salausta ei voi purkaa"
         },
+        "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Puretaan salausta",
         "download_action_downloading": "Ladataan",
         "download_failed": "Lataus epäonnistui",
+        "download_failed_description": "Tiedostoa ladattaessa tapahtui virhe",
         "edits": {
             "tooltip_label": "Muokattu %(date)s. Napsauta nähdäksesi muokkaukset.",
             "tooltip_sub": "Napsauta nähdäksesi muokkaukset",
@@ -3338,6 +3321,9 @@
         "toast_title": "Päivitä %(brand)s",
         "unavailable": "Ei saatavilla"
     },
+    "update_room_access_modal": {
+        "title": "Salli vieraskäyttäjien liittyä tähän huoneeseen"
+    },
     "upload_failed_generic": "Tiedoston '%(fileName)s' lähettäminen ei onnistunut.",
     "upload_failed_size": "Tiedoston '%(fileName)s' koko ylittää tämän kotipalvelimen lähetettyjen tiedostojen ylärajan",
     "upload_failed_title": "Lähetys epäonnistui",
@@ -3347,6 +3333,7 @@
         "error_files_too_large": "Tiedostot ovat <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
         "error_some_files_too_large": "Osa tiedostoista on <b>liian isoja</b> lähetettäväksi. Tiedoston kokoraja on %(limit)s.",
         "error_title": "Lähetysvirhe",
+        "not_image": "Valitsemasi tiedosto ei ole kelvollinen kuvatiedosto.",
         "title": "Lähetä tiedostot",
         "title_progress": "Lähettää tiedostoa (%(current)s / %(total)s)",
         "upload_all_button": "Lähetä kaikki palvelimelle",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f0816eae92..4dd7c426f7 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -55,6 +55,8 @@
         "create_a_room": "Créer un salon",
         "create_account": "Créer un compte",
         "decline": "Refuser",
+        "decline_and_block": "Refuser et bloquer",
+        "decline_invite": "Refuser l’invitation",
         "delete": "Supprimer",
         "deny": "Interdire",
         "disable": "Désactiver",
@@ -107,7 +109,6 @@
         "react": "Réagir",
         "refresh": "Rafraîchir",
         "register": "S’inscrire",
-        "reject": "Rejeter",
         "reload": "Recharger",
         "remove": "Supprimer",
         "rename": "Renommer",
@@ -156,6 +157,7 @@
         "view_message": "Afficher le message",
         "view_source": "Voir la source",
         "yes": "Oui",
+        "yes_dismiss": "Oui, rejeter",
         "zoom_in": "Zoomer",
         "zoom_out": "Dé-zoomer"
     },
@@ -385,6 +387,7 @@
             "fallback_button": "Commencer l’authentification",
             "mas_cross_signing_reset_cta": "Accédez à votre compte",
             "mas_cross_signing_reset_description": "Réinitialisez votre identité par l’intermédiaire de votre fournisseur de compte, puis revenez et cliquez sur « Réessayer ».",
+            "mas_cross_signing_reset_title": "Accédez à votre compte pour réinitialiser votre identité",
             "msisdn": "Un message a été envoyé à %(msisdn)s",
             "msisdn_token_incorrect": "Jeton incorrect",
             "msisdn_token_prompt": "Merci de saisir le code qu’il contient :",
@@ -486,7 +489,6 @@
         "capabilities": "Capacités",
         "copied": "Copié !",
         "credits": "Crédits",
-        "cross_signing": "Signature croisée",
         "dark": "Sombre",
         "description": "Description",
         "deselect_all": "Tout désélectionner",
@@ -525,6 +527,7 @@
         "message_timestamp_invalid": "Horodatage non valide",
         "microphone": "Micro",
         "model": "Modèle",
+        "moderation_and_safety": "Modération et sécurité",
         "modern": "Moderne",
         "mute": "Mettre en sourdine",
         "n_members": {
@@ -746,6 +749,13 @@
         "twemoji": "L’art émoji <twemoji>Twemoji</twemoji> est © <author>Twitter, Inc et autres contributeurs</author> utilisé sous licence <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "La police <colr>twemoji-colr</colr> est © <author>Mozilla Foundation</author> utilisée sous licence <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Êtes-vous sûr de vouloir refuser l'invitation à rejoindre \"%(roomName)s\"  ?",
+        "ignore_user_help": "Vous ne verrez aucun message ni aucune invitation à un salon de la part de cet utilisateur.",
+        "reason_description": "Décrivez la raison pour laquelle vous avez signalé le salon.",
+        "report_room_description": "Signalez ce salon à votre fournisseur de compte.",
+        "title": "Refuser l'invitation"
+    },
     "desktop_default_device_name": "%(brand)s pour bureau : %(platformName)s",
     "devtools": {
         "active_widgets": "Widgets actifs",
@@ -846,6 +856,9 @@
         "setting_colon": "Paramètre :",
         "setting_definition": "Définition du paramètre :",
         "setting_id": "Identifiant de paramètre",
+        "settings": {
+            "elementCallUrl": "Lien d'Element Call"
+        },
         "settings_explorer": "Explorateur de paramètres",
         "show_hidden_events": "Afficher les évènements cachés dans le fil de discussion",
         "spaces": {
@@ -898,44 +911,25 @@
     "empty_room_was_name": "Salon vide (précédemment %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Saisissez votre phrase de sécurité ou <button>utilisez votre clé de récupération</button> pour continuer.",
+            "alternatives": "Si vous avez une clé de récupération ou une phrase de sécurité, cela fonctionnera également.",
             "key_validation_text": {
-                "invalid_security_key": "Clé de récupération incorrecte",
-                "recovery_key_is_correct": "Ça a l’air correct !",
-                "wrong_file_type": "Mauvais type de fichier",
-                "wrong_security_key": "Clé de récupération incorrecte"
+                "wrong_security_key": "La clé de récupération que vous avez saisie est incorrecte."
             },
-            "reset_title": "Tout réinitialiser",
-            "reset_warning_1": "Poursuivez seulement si vous n’avez aucun autre appareil avec lequel procéder à la vérification.",
-            "reset_warning_2": "Si vous réinitialisez tout, vous allez repartir sans session et utilisateur de confiance. Vous pourriez ne pas voir certains messages passés.",
+            "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_phrase_incorrect_error": "Impossible d’accéder à l’espace de stockage sécurisé. Merci de vérifier que vous avez saisi la bonne phrase de sécurité.",
-            "security_phrase_title": "Phrase de sécurité",
-            "separator": "%(securityKey)s ou %(recoveryFile)s",
-            "use_security_key_prompt": "Utilisez votre clé de récupération pour continuer."
+            "security_key_title": "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_not_ready": "La signature croisée n’est pas configurée.",
-        "cross_signing_ready": "La signature croisée est prête à être utilisée.",
-        "cross_signing_ready_no_backup": "La signature croisée est prête mais les clés ne sont pas sauvegardées.",
         "cross_signing_room_normal": "Ce salon est chiffré de bout en bout",
         "cross_signing_room_verified": "Tout le monde dans ce salon est vérifié",
         "cross_signing_room_warning": "Quelqu’un utilise une session inconnue",
-        "cross_signing_unsupported": "Votre serveur d’accueil ne prend pas en charge 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.",
         "cross_signing_user_normal": "Vous n’avez pas vérifié cet utilisateur.",
         "cross_signing_user_verified": "Vous avez vérifié cet utilisateur. Cet utilisateur a vérifié toutes ses sessions.",
         "cross_signing_user_warning": "Cet utilisateur n’a pas vérifié toutes ses sessions.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Vider les clés de signature croisée",
-            "title": "Détruire les clés de signature croisée ?",
-            "warning": "La suppression des clés de signature croisée est permanente. Tous ceux que vous avez vérifié vont voir des alertes de sécurité. Il est peu probable que ce soit ce que vous voulez faire, sauf si vous avez perdu tous les appareils vous permettant d’effectuer une signature croisée."
-        },
         "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_key": "Chiffré par une session non vérifiée",
@@ -962,7 +956,6 @@
             "title": "Nouvelle méthode de récupération",
             "warning": "Si vous n’avez pas activé de nouvelle méthode de récupération, un attaquant essaye peut-être d’accéder à votre compte. Changez immédiatement le mot de passe de votre compte et configurez une nouvelle méthode de récupération dans les paramètres."
         },
-        "not_supported": "<non pris en charge>",
         "pinned_identity_changed": "L'identité de %(displayName)s (<b>%(userId)s</b>) semble avoir changé. <a>En savoir plus</a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>semble avoir changé d'identité. <a>En savoir plus</a>",
         "recovery_method_removed": {
@@ -978,9 +971,10 @@
         "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.",
-            "title": "Configurer"
+            "explainer": "Sauvegardez vos clés avant de vous déconnecter pour éviter de les perdre."
         },
+        "turn_on_key_storage": "Activer le stockage des clés",
+        "turn_on_key_storage_description": "Stockez votre identité cryptographique et vos clés de message en toute sécurité sur le serveur. Cela vous permettra de consulter l'historique de vos messages sur tous les nouveaux appareils.",
         "udd": {
             "interactive_verification_button": "Vérifier de façon interactive avec des émojis",
             "other_ask_verify_text": "Demandez à cet utilisateur de vérifier sa session, ou vérifiez-la manuellement ci-dessous.",
@@ -994,7 +988,6 @@
             "accepting": "Acceptation…",
             "after_new_login": {
                 "device_verified": "Appareil vérifié",
-                "reset_confirmation": "Réinitialiser les clés de vérification, c’est certain ?",
                 "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"
@@ -1065,8 +1058,6 @@
             "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_reset_warning_1": "La réinitialisation de vos clés de vérification ne peut pas être annulé. Après la réinitialisation, vous n’aurez plus accès à vos anciens messages chiffrés, et tous les amis que vous aviez précédemment vérifiés verront des avertissement de sécurité jusqu'à ce vous les vérifiiez à nouveau.",
-            "verify_reset_warning_2": "Veuillez ne continuer que si vous êtes certain d’avoir perdu tous vos autres appareils et votre clé de récupération.",
             "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",
@@ -1135,11 +1126,7 @@
             "title": "Impossible de copier le lien du salon"
         },
         "error_loading_user_profile": "Impossible de charger le profil de l’utilisateur",
-        "forget_room_failed": "Échec de l’oubli du salon %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
-            "title": "Échec de la recherche"
-        }
+        "forget_room_failed": "Échec de l’oubli du salon %(errCode)s"
     },
     "error_user_not_logged_in": "L’utilisateur n’est pas identifié",
     "event_preview": {
@@ -1674,6 +1661,7 @@
         "class_global": "Global",
         "class_other": "Autre",
         "default": "Par défaut",
+        "default_settings": "Correspondre aux paramètres par défaut",
         "email_pusher_app_display_name": "Notifications par courriel",
         "enable_prompt_toast_description": "Activer les notifications sur le bureau",
         "enable_prompt_toast_title": "Notifications",
@@ -1692,7 +1680,8 @@
         "mentions_and_keywords_description": "Recevoir des notifications uniquement pour les mentions et mot-clés comme défini dans vos <a>paramètres</a>",
         "mentions_keywords": "Mentions et mots-clés",
         "message_didnt_send": "Le message n’a pas été envoyé. Cliquer pour plus d’info.",
-        "mute_description": "Vous n’aurez aucune notification"
+        "mute_description": "Vous n’aurez aucune notification",
+        "mute_room": "Rendre le salon muet"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s demande une vérification"
@@ -1794,11 +1783,6 @@
         "ongoing": "Suppression…",
         "reason_label": "Raison (optionnelle)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Voulez-vous vraiment rejeter l’invitation ?",
-        "failed": "Échec du rejet de l’invitation",
-        "title": "Rejeter l’invitation"
-    },
     "report_content": {
         "description": "Le signalement de ce message enverra son « event ID » unique à l’administrateur de votre serveur d’accueil. Si les messages dans ce salon sont chiffrés, l’administrateur ne pourra pas lire le texte du message ou voir les fichiers ou les images.",
         "disagree": "Désaccord",
@@ -1822,10 +1806,8 @@
         "toxic_behaviour": "Comportement toxique"
     },
     "report_room": {
-        "description": "Signalez cette salle à l'administrateur de votre serveur d'accueil. Cela enverra l'identifiant unique du salon, mais si les messages sont chiffrés, l'administrateur ne pourra pas les lire ni consulter les fichiers partagés.",
-        "reason_placeholder": " Motif du signalement...",
-        "sent": "Votre signalement a été envoyé.",
-        "title": "Signaler le salon"
+        "description": "Signalez ce salon à votre fournisseur de compte. Si les messages sont chiffrés, votre administrateur ne pourra pas les lire.",
+        "reason_label": "Décrivez la raison"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Le déchiffrement de %(failedCount)s sessions a échoué !",
@@ -1974,6 +1956,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",
@@ -2009,7 +1992,6 @@
             "you_created": "Vous avez créé ce salon."
         },
         "invite_email_mismatch_suggestion": "Partagez cet e-mail dans les paramètres pour recevoir les invitations directement dans %(brand)s.",
-        "invite_reject_ignore": "Rejeter et ignorer l’utilisateur",
         "invite_sent_to_email": "Cet invitation a été envoyée à %(email)s",
         "invite_sent_to_email_room": "Cette invitation à %(roomName)s a été envoyée à %(email)s",
         "invite_subtitle": "<userName/> vous a invité",
@@ -2105,6 +2087,7 @@
             },
             "uploading_single_file": "Envoi de %(filename)s"
         },
+        "video_room": "Ce salon est un salon vidéo",
         "waiting_for_join_subtitle": "Une fois que les utilisateurs invités seront connectés sur %(brand)s, vous pourrez discuter et le salon sera chiffré de bout en bout",
         "waiting_for_join_title": "En attente de connexion des utilisateurs à %(brand)s"
     },
@@ -2119,11 +2102,14 @@
             "no_chats_description_no_room_rights": "Commencez par envoyer un message à quelqu'un",
             "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_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",
             "no_rooms": "Vous n’êtes membre d’aucun salon",
             "no_rooms_description": "Veuillez désélectionner des filtres pour voir vos discussions",
             "no_unread": "Félicitations ! Vous n'avez aucun message non lu",
+            "show_activity": "Voir toutes les activités",
             "show_chats": "Afficher toutes les discussions"
         },
         "failed_add_tag": "Échec de l’ajout de l’étiquette %(tagName)s au salon",
@@ -2131,9 +2117,12 @@
         "failed_set_dm_tag": "Échec de l’ajout de l’étiquette de conversation privée",
         "filters": {
             "favourite": "Favoris",
+            "invites": "Invitations",
+            "low_priority": "Faible priorité",
+            "mentions": "Mentions",
             "people": "Personnes",
             "rooms": "Salons",
-            "unread": "Non lu"
+            "unread": "Non-lus"
         },
         "home_menu_label": "Options de l’accueil",
         "join_public_room_label": "Rejoindre le salon public",
@@ -2161,15 +2150,21 @@
             "more_options": "Plus d’options",
             "open_room": "Ouvrir salon %(roomName)s"
         },
+        "room_options": "Options du salon",
         "show_less": "En voir moins",
         "show_n_more": {
             "other": "En afficher %(count)s de plus",
             "one": "En afficher %(count)s de plus"
         },
         "show_previews": "Afficher un aperçu des messages",
+        "sort": "Trier",
         "sort_by": "Trier par",
         "sort_by_activity": "Activité",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Activité",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Afficher les salons non lus en premier",
         "space_menu": {
             "home": "Accueil de l’espace",
@@ -2457,6 +2452,10 @@
         "recent_changes_heading": "Changements récents qui n’ont pas encore été reçus",
         "title": "Le serveur ne répond pas"
     },
+    "service_worker_error": {
+        "description": "%(brand)s nécessite un service worker pour charger les médias authentifiés à partir des référentiels de contenu Matrix. Ceci n'est pas pris en charge par votre navigateur. Il est donc possible que le contenu multimédia ne se charge pas.",
+        "title": "Échec du chargement du service worker"
+    },
     "seshat": {
         "error_initialising": "Échec de l’initialisation de la recherche de messages, vérifiez <a>vos paramètres</a> pour plus d’information",
         "reset_button": "Réinitialiser le magasin d’évènements",
@@ -2535,6 +2534,7 @@
                 "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_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.",
                 "details_title": "Détails du chiffrement",
                 "do_not_close_warning": "Ne fermez pas cette fenêtre tant que la réinitialisation n'est pas terminée",
@@ -2549,6 +2549,8 @@
                 "session_key": "Clé de session :",
                 "title": "Avancé"
             },
+            "confirm_key_storage_off": "Êtes-vous sûr de vouloir désactiver le stockage des clés ?",
+            "confirm_key_storage_off_description": "Si vous vous déconnectez de tous vos appareils, vous perdrez l'historique de vos messages et vous devrez vérifier à nouveau tous vos contacts existants. <a>En savoir plus </a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Désactiver la sauvegarde",
                 "confirm": "Désactiver la sauvegarde",
@@ -2634,6 +2636,7 @@
             "discovery_needs_terms_title": "Laissez les gens vous trouver",
             "display_name": "Nom d'affichage",
             "display_name_error": "Impossible de définir le nom d'affichage",
+            "email_adding_unsupported_by_hs": "Ce serveur d'accueil ne prend pas en charge l'ajout d'adresses e-mail à votre compte.",
             "email_address_in_use": "Cette adresse e-mail est déjà utilisée",
             "email_address_label": "Adresse e-mail",
             "email_not_verified": "Votre adresse e-mail n’a pas encore été vérifiée",
@@ -2658,7 +2661,9 @@
             "error_share_msisdn_discovery": "Impossible de partager le numéro de téléphone",
             "identity_server_no_token": "Aucun jeton d’accès d’identité trouvé",
             "identity_server_not_set": "Serveur d'identité non défini",
+            "invalid_phone_number": "Le numéro de téléphone fourni est invalide.",
             "language_section": "Langue",
+            "msisdn_adding_unsupported_by_hs": "Ce serveur d'accueil ne prend pas en charge l'ajout de numéros de téléphone à votre compte.",
             "msisdn_in_use": "Ce numéro de téléphone est déjà utilisé",
             "msisdn_label": "Numéro de téléphone",
             "msisdn_verification_field_label": "Code de vérification",
@@ -2677,12 +2682,10 @@
             "unable_to_load_msisdns": "Impossible de charger les numéros de téléphone",
             "username": "Nom d’utilisateur"
         },
-        "image_thumbnails": "Afficher les aperçus/vignettes pour les images",
         "inline_url_previews_default": "Activer l’aperçu des URL par défaut",
         "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_avatars": "Afficher les avatars des salons dans lesquels vous avez été invité",
         "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).",
@@ -2741,6 +2744,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Paramètres : </strong> Utilisateurs ignorés"
         },
+        "media_preview": {
+            "hide_avatars": "Masquer les avatars des salons et des invitations",
+            "hide_media": "Toujours masquer",
+            "media_preview_description": "Un média masqué peut toujours être affiché en cliquant dessus",
+            "media_preview_label": "Afficher les médias dans les discussions",
+            "show_in_private": "Dans les salons privés",
+            "show_media": "Toujours afficher"
+        },
         "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)",
@@ -2826,57 +2837,20 @@
         "prompt_invite": "Demander avant d’envoyer des invitations à des identifiants matrix potentiellement non valides",
         "replace_plain_emoji": "Remplacer automatiquement le texte par des émojis",
         "security": {
-            "4s_public_key_in_account_data": "dans les données du compte",
-            "4s_public_key_status": "Clé publique du coffre secret :",
             "analytics_description": "Partagez des données anonymes pour nous aider à identifier les problèmes. Rien de personnel. Aucune tierce partie.",
-            "backup_key_cached_status": "Clé de sauvegarde mise en cache :",
-            "backup_key_stored_status": "Clé de sauvegarde enregistrée :",
-            "backup_key_unexpected_type": "type inattendu",
-            "backup_key_well_formed": "bien formée",
-            "backup_keys_description": "Sauvegardez vos clés de chiffrement avec les données de votre compte au cas où vous perdriez l'accès à vos sessions. Vos clés seront sécurisées à l'aide d'une clé de récupération unique.",
             "bulk_options_accept_all_invites": "Accepter les %(invitedRooms)s invitations",
             "bulk_options_reject_all_invites": "Rejeter la totalité des %(invitedRooms)s invitations",
             "bulk_options_section": "Options de groupe",
-            "cross_signing_cached": "mise en cache localement",
-            "cross_signing_homeserver_support": "Prise en charge de la fonctionnalité par le serveur d’accueil :",
-            "cross_signing_homeserver_support_exists": "existant",
-            "cross_signing_in_4s": "dans le coffre secret",
-            "cross_signing_in_memory": "en mémoire",
-            "cross_signing_master_private_Key": "Clé privée maîtresse :",
-            "cross_signing_not_cached": "non trouvée localement",
-            "cross_signing_not_found": "non trouvé",
-            "cross_signing_not_in_4s": "non trouvé dans le coffre",
-            "cross_signing_not_stored": "non sauvegardé",
-            "cross_signing_private_keys": "Clés privées de signature croisée :",
-            "cross_signing_public_keys": "Clés publiques de signature croisée :",
-            "cross_signing_self_signing_private_key": "Clé privée d’auto-signature :",
-            "cross_signing_user_signing_private_key": "Clé privée de signature de l’utilisateur :",
-            "cryptography_section": "Chiffrement",
             "dehydrated_device_description": "La fonctionnalité d’appareil hors ligne vous permet de recevoir des messages chiffrés même lorsque vous n’êtes connecté à aucun appareil",
             "dehydrated_device_enabled": "Appareil hors ligne activé",
-            "delete_backup": "Supprimer la sauvegarde",
-            "delete_backup_confirm_description": "En êtes-vous sûr ? Vous perdrez vos messages chiffrés si vos clés ne sont pas sauvegardées correctement.",
             "dialog_title": "<strong>Paramètres : </strong> Sécurité et confidentialité",
             "e2ee_default_disabled_warning": "L’administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les conversations privées.",
             "enable_message_search": "Activer la recherche de messages dans les salons chiffrés",
             "encryption_section": "Chiffrement",
-            "error_loading_key_backup_status": "Impossible de charger l’état de sauvegarde des clés",
-            "export_megolm_keys": "Exporter les clés de chiffrement de salon",
             "ignore_users_empty": "Vous n’avez ignoré personne.",
             "ignore_users_section": "Utilisateurs ignorés",
-            "import_megolm_keys": "Importer les clés de chiffrement de bout en bout",
-            "key_backup_active": "Cette session sauvegarde vos clés.",
-            "key_backup_active_version": "Version de sauvegarde active :",
-            "key_backup_active_version_none": "Aucun",
             "key_backup_algorithm": "Algorithme :",
-            "key_backup_can_be_restored": "Cette sauvegarde peut être restaurée sur cette session",
-            "key_backup_complete": "Toutes les clés ont été sauvegardées",
             "key_backup_connect": "Connecter cette session à la sauvegarde de clés",
-            "key_backup_connect_prompt": "Connectez cette session à la sauvegarde de clés avant de vous déconnecter pour éviter de perdre des clés qui seraient uniquement dans cette session.",
-            "key_backup_in_progress": "Sauvegarde de %(sessionsRemaining)s clés…",
-            "key_backup_inactive": "Cette session <b>ne sauvegarde pas vos clés</b>, mais vous n’avez pas de sauvegarde existante que vous pouvez restaurer ou compléter à l’avenir.",
-            "key_backup_inactive_warning": "Vos clés <b>ne sont pas sauvegardées sur cette session</b>.",
-            "key_backup_latest_version": "Dernière version de la sauvegarde sur le serveur :",
             "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": {
@@ -2896,13 +2870,7 @@
             "message_search_unsupported": "Il manque quelques composants à %(brand)s pour mettre en cache les messages chiffrés localement de manière sécurisée. Si vous voulez essayer cette fonctionnalité, construisez %(brand)s Desktop vous-même en <nativeLink>ajoutant les composants de recherche</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s ne peut actuellement mettre en cache vos messages chiffrés localement de manière sécurisée via le navigateur Web. Utilisez <desktopLink>%(brand)s Desktop</desktopLink> pour que les messages chiffrés apparaissent dans vos résultats de recherche.",
             "record_session_details": "Enregistrez le nom, la version et l'URL du client afin de reconnaitre les sessions plus facilement dans le gestionnaire de sessions",
-            "restore_key_backup": "Restaurer depuis la sauvegarde",
-            "secret_storage_not_ready": "pas prêt",
-            "secret_storage_ready": "prêt",
-            "secret_storage_status": "Coffre secret :",
             "send_analytics": "Envoyer les données de télémétrie",
-            "session_id": "Identifiant de session :",
-            "session_key": "Clé de session :",
             "strict_encryption": "Envoyer des messages uniquement aux utilisateurs vérifiés"
         },
         "send_read_receipts": "Envoyer les accusés de réception",
@@ -3013,6 +2981,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",
@@ -3145,8 +3114,6 @@
         "topic": "Récupère ou définit le sujet du salon",
         "topic_none": "Ce salon n'a pas de sujet.",
         "topic_room_error": "Impossible de récupérer le sujet du salon : Salon introuvable (%(roomId)s)",
-        "tovirtual": "Bascule dans le salon virtuel de ce salon, s'il en a un",
-        "tovirtual_not_found": "Aucun salon virtuel pour ce salon",
         "unban": "Révoque le bannissement de l’utilisateur ayant l’identifiant fourni",
         "unflip": "Ajoute ┬──┬ ノ( ゜-゜ノ) en préfixe du message",
         "unholdcall": "Reprend l’appel en attente dans ce salon",
@@ -3269,7 +3236,7 @@
         "heading_without_query": "Recherche de",
         "join_button_text": "Rejoindre %(roomAddress)s",
         "keyboard_scroll_hint": "Utilisez <arrows/> pour faire défiler",
-        "message_search_section_title": "Autres recherches",
+        "messages_label": "Messages",
         "other_rooms_in_space": "Autres salons dans %(spaceName)s",
         "public_rooms_label": "Salons publics",
         "public_spaces_label": "Espaces publics",
@@ -3279,7 +3246,6 @@
         "result_may_be_hidden_privacy_warning": "Certains résultats pourraient être masqués pour des raisons de confidentialité",
         "result_may_be_hidden_warning": "Certains résultats peuvent être cachés",
         "search_dialog": "Fenêtre de recherche",
-        "search_messages_hint": "Pour chercher des messages, repérez cette icône en haut à droite d'un salon <icon/>",
         "spaces_title": "Espaces où vous êtes",
         "start_group_chat_button": "Démarrer une conversation de groupe"
     },
@@ -3328,9 +3294,7 @@
     "threads_activity_centre": {
         "header": "Activité des fils de discussions",
         "no_rooms_with_threads_notifs": "Vous n’avez pas encore de salons avec des notifications de fil de discussion.",
-        "no_rooms_with_unread_threads": "Vous n'avez pas encore de salons contenant des fils de discussion non lus.",
-        "release_announcement_description": "Les notifications des fils de discussion ont été déplacées. À partir de maintenant, retrouvez-les ici.",
-        "release_announcement_header": "Centre d'activité des fils de discussions"
+        "no_rooms_with_unread_threads": "Vous n'avez pas encore de salons contenant des fils de discussion non lus."
     },
     "time": {
         "about_day_ago": "il y a environ un jour",
@@ -3841,10 +3805,11 @@
         "unavailable": "Indisponible"
     },
     "update_room_access_modal": {
-        "description": "Pour créer un lien de partage, vous devez autoriser les invités à rejoindre ce salon. Cela peut rendre le salon moins sûr. Lorsque vous aurez terminé l'appel, vous pourrez redéfinir la confidentialité du salon.",
-        "dont_change_description": "Vous pouvez également prendre l'appel dans un salon séparé.",
+        "description": "Pour créer un lien de partage, rendez ce salon <b>publique</b> ou activer l 'option permettant aux utilisateurs de <b>demander à rejoindre</b>. Cela permet aux invités de participer sans être invités.",
+        "dont_change_description": "Si vous ne souhaitez pas modifier l'accès à ce salon, vous pouvez créer un nouveau salon pour le lien d'appel.",
         "no_change": "Je ne souhaite pas modifier le niveau d'accès.",
-        "title": "Modifier le niveau d'accès du salon"
+        "revert_access_description": "(Ceci peut être rétabli à sa valeur précédente dans les paramètres du salon : <b> Sécurité et confidentialité</b>/<b>Accès</b>)",
+        "title": "Autoriser les utilisateurs invités à rejoindre ce salon"
     },
     "upload_failed_generic": "Le fichier « %(fileName)s » n’a pas pu être envoyé.",
     "upload_failed_size": "Le fichier « %(fileName)s » dépasse la taille limite autorisée par ce serveur pour les envois",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 008776a8fb..be37d40bc6 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -83,7 +83,6 @@
         "react": "Reacciona",
         "refresh": "Actualizar",
         "register": "Rexistrar",
-        "reject": "Rexeitar",
         "remove": "Eliminar",
         "rename": "Cambiar nome",
         "reply": "Resposta",
@@ -370,7 +369,6 @@
         "capabilities": "Capacidades",
         "copied": "Copiado!",
         "credits": "Créditos",
-        "cross_signing": "Sinatura cruzada",
         "dark": "Escuro",
         "description": "Descrición",
         "deselect_all": "Retirar selección a todos",
@@ -671,44 +669,23 @@
     "empty_room_was_name": "Sala baleira (era %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Escribe a túa Frase de Seguridade ou <button>usa a túa Chave de Seguridade</button> para continuar.",
             "key_validation_text": {
-                "invalid_security_key": "Chave de Seguridade non válida",
-                "recovery_key_is_correct": "Pinta ben!",
-                "wrong_file_type": "Tipo de ficheiro erróneo",
                 "wrong_security_key": "Chave de Seguridade incorrecta"
             },
-            "reset_title": "Restablecer todo",
-            "reset_warning_1": "Fai isto únicamente se non tes outro dispositivo co que completar a verificación.",
-            "reset_warning_2": "Se restableces todo, volverás a comezar sen sesións verificadas, usuarias de confianza, e poderías non poder ver as mensaxes anteriores.",
             "restoring": "Restablecendo chaves desde a copia",
-            "security_key_title": "Chave de Seguridade",
-            "security_phrase_incorrect_error": "Non se puido acceder ao almacenaxe segredo. Comproba que escribiches correctamente a Frase de Seguridade.",
-            "security_phrase_title": "Frase de seguridade",
-            "separator": "%(securityKey)s ou %(recoveryFile)s",
-            "use_security_key_prompt": "Usa a túa Chave de Seguridade para continuar."
+            "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_not_ready": "Non está configurada a Sinatura-Cruzada.",
-        "cross_signing_ready": "A Sinatura-Cruzada está lista para usar.",
-        "cross_signing_ready_no_backup": "A sinatura-cruzada está preparada pero non hai copia das chaves.",
         "cross_signing_room_normal": "Esta sala está cifrada extremo-a-extremo",
         "cross_signing_room_verified": "Todas nesta sala están verificadas",
         "cross_signing_room_warning": "Alguén está a usar unha sesión descoñecida",
-        "cross_signing_unsupported": "O teu servidor non soporta a sinatura cruzada.",
-        "cross_signing_untrusted": "A túa conta ten unha identidade de sinatura cruzada no almacenaxe segredo, pero aínda non confiaches nela nesta sesión.",
         "cross_signing_user_normal": "Non verificaches esta usuaria.",
         "cross_signing_user_verified": "Verificaches esta usuaria. A usuaria verificou todas as súas sesións.",
         "cross_signing_user_warning": "Esta usuaria non verificou ningunha das súas sesións.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Baleirar chaves de sinatura-cruzada",
-            "title": "Destruír chaves de sinatura-cruzada?",
-            "warning": "O eliminación das chaves de sinatura cruzada é permanente. Calquera a quen verificases con elas verá alertas de seguridade. Seguramente non queres facer esto, a menos que perdeses todos os dispositivos nos que podías asinar."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "A autenticidade desta mensaxe cifrada non está garantida neste dispositivo.",
         "event_shield_reason_mismatched_sender_key": "Cifrada por unha sesión non verificada",
         "export_unsupported": "O seu navegador non soporta as extensións de criptografía necesarias",
@@ -728,7 +705,6 @@
             "title": "Novo Método de Recuperación",
             "warning": "Se non configuras o novo método de recuperación, un atacante podería intentar o acceso á túa conta. Cambia inmediatamente o contrasinal da conta e configura un novo método de recuperación nos Axustes."
         },
-        "not_supported": "<non soportado>",
         "recovery_method_removed": {
             "description_1": "Esta sesión detectou que se eliminaron a túa Frase de Seguridade e chave para Mensaxes Seguras.",
             "description_2": "Se fixeches esto sen querer, podes configurar Mensaxes Seguras nesta sesión e volverá a cifrar as mensaxes da sesión cun novo método de recuperación.",
@@ -739,8 +715,7 @@
         "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.",
-            "title": "Configurar"
+            "explainer": "Fai unha copia de apoio das chaves antes de saír para evitar perdelas."
         },
         "udd": {
             "interactive_verification_button": "Verificar interactivamente usando emoji",
@@ -755,7 +730,6 @@
             "accepting": "Aceptando…",
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
-                "reset_confirmation": "Queres restablecer as chaves de verificación?",
                 "skip_verification": "Omitir a verificación por agora",
                 "unable_to_verify": "Non se puido verificar este dispositivo",
                 "verify_this_device": "Verifica este dispositivo"
@@ -818,7 +792,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_reset_warning_1": "O restablecemento das chaves de seguridade non se pode desfacer. Tras o restablecemento, non terás acceso ás antigas mensaxes cifradas, e calquera amizade que verificaras con anterioridade vai ver un aviso de seguridade ata que volvades a verificarvos mutuamente.",
             "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",
@@ -873,11 +846,7 @@
             "title": "Non se puido copiar ligazón da sala"
         },
         "error_loading_user_profile": "Non se cargou o perfil da usuaria",
-        "forget_room_failed": "Fallo ao esquecer sala %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "O servidor podería non estar dispoñible, sobrecargado, ou caducou a busca :(",
-            "title": "Fallou a busca"
-        }
+        "forget_room_failed": "Fallo ao esquecer sala %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1407,11 +1376,6 @@
         "ongoing": "Eliminando…",
         "reason_label": "Razón (optativa)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Seguro que desexa rexeitar o convite?",
-        "failed": "Fallo ao rexeitar o convite",
-        "title": "Rexeitar convite"
-    },
     "report_content": {
         "description": "Ao denunciar esta mensaxe vasnos enviar o seu 'event ID' único á administración do servidor. Se as mensaxes da sala están cifradas, a administración do servidor non poderá ler o texto da mensaxe ou ver imaxes ou ficheiros.",
         "disagree": "En desacordo",
@@ -1540,7 +1504,6 @@
             "you_created": "Creaches esta sala."
         },
         "invite_email_mismatch_suggestion": "Comparte este email en Axustes para recibir convites directamente en %(brand)s.",
-        "invite_reject_ignore": "Rexeitar e Ignorar usuaria",
         "invite_sent_to_email": "Este convite enviouse a %(email)s",
         "invite_sent_to_email_room": "Este convite para %(roomName)s foi enviado a %(email)s",
         "invite_subtitle": "<userName/> convidoute",
@@ -1995,7 +1958,6 @@
             "remove_msisdn_prompt": "Eliminar %(phone)s?",
             "spell_check_locale_placeholder": "Elixe o idioma"
         },
-        "image_thumbnails": "Mostrar miniaturas/vista previa das imaxes",
         "inline_url_previews_default": "Activar por defecto as vistas previas en liña de URL",
         "inline_url_previews_room": "Activar a vista previa de URL por defecto para as participantes nesta sala",
         "inline_url_previews_room_account": "Activar vista previa de URL nesta sala (só che afecta a ti)",
@@ -2093,48 +2055,16 @@
         "prompt_invite": "Avisar antes de enviar convites a IDs de Matrix potencialmente incorrectos",
         "replace_plain_emoji": "Substituír automaticamente Emoji en texto plano",
         "security": {
-            "4s_public_key_in_account_data": "nos datos da conta",
-            "4s_public_key_status": "Chave pública da almacenaxe segreda:",
-            "backup_key_cached_status": "Chave da copia na caché:",
-            "backup_key_stored_status": "Chave da copia gardada:",
-            "backup_key_unexpected_type": "tipo non agardado",
-            "backup_key_well_formed": "ben formado",
-            "backup_keys_description": "Fai unha copia de apoio das chaves de cifrado da túa conta en caso de perder o acceso ás túas sesións. As chaves estarán seguras cunha única Chave de Seguridade.",
             "bulk_options_accept_all_invites": "Aceptar os %(invitedRooms)s convites",
             "bulk_options_reject_all_invites": "Rexeitar todos os %(invitedRooms)s convites",
             "bulk_options_section": "Opcións agrupadas",
-            "cross_signing_cached": "na caché local",
-            "cross_signing_homeserver_support": "Soporte de funcións do servidor:",
-            "cross_signing_homeserver_support_exists": "existe",
-            "cross_signing_in_4s": "no almacenaxe segredo",
-            "cross_signing_in_memory": "en memoria",
-            "cross_signing_master_private_Key": "Chave mestra principal:",
-            "cross_signing_not_cached": "non se atopa localmente",
-            "cross_signing_not_found": "non atopado",
-            "cross_signing_not_in_4s": "non atopado no almacenaxe",
-            "cross_signing_not_stored": "non gardado",
-            "cross_signing_private_keys": "Chaves privadas da sinatura cruzada:",
-            "cross_signing_public_keys": "Chaves públicas da sinatura cruzada:",
-            "cross_signing_self_signing_private_key": "Auto asinado da chave privada:",
-            "cross_signing_user_signing_private_key": "Chave privada de sinatura da usuaria:",
-            "cryptography_section": "Criptografía",
-            "delete_backup": "Borrar copia de apoio",
-            "delete_backup_confirm_description": "Estás seguro? Perderás as mensaxes cifradas se non tes unha copia de apoio das chaves de cifrado.",
             "e2ee_default_disabled_warning": "A administración do servidor desactivou por defecto o cifrado extremo-a-extremo en salas privadas e Mensaxes Directas.",
             "enable_message_search": "Activar a busca de mensaxes en salas cifradas",
             "encryption_section": "Cifrado",
-            "error_loading_key_backup_status": "Non se puido cargar o estado das chaves de apoio",
-            "export_megolm_keys": "Exportar chaves E2E da sala",
             "ignore_users_empty": "Non tes usuarias ignoradas.",
             "ignore_users_section": "Usuarias ignoradas",
-            "import_megolm_keys": "Importar chaves E2E da sala",
-            "key_backup_active_version_none": "Nada",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_complete": "Copiaronse todas as chaves",
             "key_backup_connect": "Conecta esta sesión a Copia de Apoio de chaves",
-            "key_backup_connect_prompt": "Conecta esta sesión ao gardado das chaves antes de desconectarte para evitar perder calquera chave que só puidese estar nesta sesión.",
-            "key_backup_inactive": "Esta sesión <b>non está facendo copia das chaves</b>, pero tes unha copia de apoio existente que podes restablecer e engadir para seguir adiante.",
-            "key_backup_inactive_warning": "As túas chaves <b>non están a ser copiadas desde esta sesión</b>.",
             "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": {
@@ -2153,13 +2083,7 @@
             "message_search_space_used": "Espazo utilizado:",
             "message_search_unsupported": "Falta un compoñente de %(brand)s requerido para almacenar localmente mensaxes cifradas na caché. Se queres experimentar con esta función, compila unha versión personalizada de %(brand)s Desktop <nativeLink>cos compoñentes de busca engadidos</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s non pode por na caché local de xeito as mensaxes cifradas cando usa un navegador web. Usa <desktopLink>%(brand)s Desktop</desktopLink> para que as mensaxes cifradas aparezan nos resultados.",
-            "restore_key_backup": "Restaurar desde copia de apoio",
-            "secret_storage_not_ready": "non lista",
-            "secret_storage_ready": "lista",
-            "secret_storage_status": "Almacenaxe segreda:",
             "send_analytics": "Enviar datos de análises",
-            "session_id": "ID da sesión:",
-            "session_key": "Chave da sesión:",
             "strict_encryption": "Non enviar nunca desde esta sesión mensaxes cifradas a sesións non verificadas"
         },
         "send_read_receipts": "Enviar resgardos de lectura",
@@ -2317,8 +2241,6 @@
         "topic": "Obtén ou establece o asunto da sala",
         "topic_none": "Esta sala non ten asunto.",
         "topic_room_error": "Non se obtivo o asunto da sala: Non se atopou a sala (%(roomId)s)",
-        "tovirtual": "Cambia á sala virtual desta sala, se é que existe",
-        "tovirtual_not_found": "No hai sala virtual para esta sala",
         "unban": "Desbloquea usuaria co ID dado",
         "unflip": "Antecede con ┬──┬ ノ( ゜-゜ノ) a unha mensaxe de texto plano",
         "unholdcall": "Acepta a chamada na sala actual",
@@ -2437,7 +2359,6 @@
         "heading_without_query": "Buscar",
         "join_button_text": "Unirse a %(roomAddress)s",
         "keyboard_scroll_hint": "Usa <arrows/> para desprazarte",
-        "message_search_section_title": "Outras buscas",
         "other_rooms_in_space": "Outras salas en %(spaceName)s",
         "public_rooms_label": "Salas públicas",
         "recent_searches_section_title": "Buscas recentes",
@@ -2446,7 +2367,6 @@
         "result_may_be_hidden_privacy_warning": "Algúns resultados poden estar agochados por privacidade",
         "result_may_be_hidden_warning": "Algúns resultados poderían estar agochados",
         "search_dialog": "Diálogo de busca",
-        "search_messages_hint": "Para buscar mensaxes, busca esta icona arriba de todo na sala <icon/>",
         "spaces_title": "Espazos nos que estás",
         "start_group_chat_button": "Inicia un chat en grupo"
     },
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 63bda4eb71..22a1cecc89 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -73,7 +73,6 @@
         "react": "הגב",
         "refresh": "רענן",
         "register": "צור חשבון",
-        "reject": "דחה",
         "reload": "טעינה מחדש",
         "remove": "הסר",
         "rename": "שנה שם",
@@ -338,7 +337,6 @@
         "capabilities": "יכולות",
         "copied": "הועתק!",
         "credits": "נקודות זכות",
-        "cross_signing": "חתימה צולבת",
         "dark": "כהה",
         "description": "תאור",
         "deselect_all": "הסר סימון מהכל",
@@ -570,37 +568,22 @@
     "encryption": {
         "access_secret_storage_dialog": {
             "key_validation_text": {
-                "invalid_security_key": "מפתח אבטחה לא חוקי",
-                "recovery_key_is_correct": "נראה טוב!",
-                "wrong_file_type": "סוג קובץ שגוי",
                 "wrong_security_key": "מפתח אבטחה שגוי"
             },
             "restoring": "שחזור מפתחות מגיבוי",
-            "security_key_title": "מפתח אבטחה",
-            "security_phrase_incorrect_error": "אין אפשרות לגשת לאחסון הסודי. אנא אשר שהזנת את ביטוי האבטחה הנכון.",
-            "security_phrase_title": "ביטוי אבטחה",
-            "use_security_key_prompt": "השתמש במפתח האבטחה שלך כדי להמשיך."
+            "security_key_title": "מפתח אבטחה"
         },
         "bootstrap_title": "מגדיר מפתחות",
         "cancel_entering_passphrase_description": "האם אתם בטוחים שהינכם רוצים לבטל?",
         "cancel_entering_passphrase_title": "בטל הקלדת סיסמא?",
         "confirm_encryption_setup_body": "לחץ על הלחצן למטה כדי לאשר את הגדרת ההצפנה.",
         "confirm_encryption_setup_title": "אשר את הגדרת ההצפנה",
-        "cross_signing_not_ready": "חתימה צולבת אינה מוגדרת עדיין.",
-        "cross_signing_ready": "חתימה צולבת מוכנה לשימוש.",
         "cross_signing_room_normal": "חדר זה מוצפן מקצה לקצה",
         "cross_signing_room_verified": "כולם מאומתים בחדר זה",
         "cross_signing_room_warning": "מישהו משתמש בהפעלה לא ידועה",
-        "cross_signing_unsupported": "השרת שלכם אינו תומך בחתימות-צולבות.",
-        "cross_signing_untrusted": "לחשבונך זהות חתימה צולבת באחסון סודי, אך הפגישה זו אינה מהימנה עדיין.",
         "cross_signing_user_normal": "לא אימתת משתמש זה.",
         "cross_signing_user_verified": "אימתת משתמש זה. משתמש זה אימת את כל ההפעלות שלו.",
         "cross_signing_user_warning": "משתמש זה לא אימת את כל ההפעלות שלו.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "נקה מפתחות חתימה צולבת",
-            "title": "להרוס מפתחות חתימה צולבת?",
-            "warning": "מחיקת מפתחות חתימה צולבת הינה קבועה. כל מי שאימתת איתו יראה התראות אבטחה. כמעט בוודאות אינך רוצה לעשות זאת, אלא אם איבדת כל מכשיר ממנו תוכל לחתום."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "לא ניתן להבטיח את האותנטיות של הודעה מוצפנת זו במכשיר זה.",
         "event_shield_reason_mismatched_sender_key": "הוצפן על ידי מושב לא מאומת",
         "export_unsupported": "הדפדפן שלכם אינו תומך בהצפנה הדרושה",
@@ -616,7 +599,6 @@
             "title": "שיטת שחזור חדשה",
             "warning": "אם לא הגדרת את שיטת השחזור החדשה, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות."
         },
-        "not_supported": "<לא נתמך>",
         "recovery_method_removed": {
             "description_2": "אם עשית זאת בטעות, באפשרותך להגדיר הודעות מאובטחות בהפעלה זו אשר תצפין מחדש את היסטוריית ההודעות של הפגישה בשיטת שחזור חדשה.",
             "title": "שיטת השחזור הוסרה",
@@ -625,8 +607,7 @@
         "set_up_toast_description": "שמור מפני איבוד גישה אל הודעות ומידע מוצפן",
         "set_up_toast_title": "צור גיבוי מאובטח",
         "setup_secure_backup": {
-            "explainer": "גבה את המפתחות שלך לפני היציאה כדי להימנע מלאבד אותם.",
-            "title": "הגדר"
+            "explainer": "גבה את המפתחות שלך לפני היציאה כדי להימנע מלאבד אותם."
         },
         "udd": {
             "other_ask_verify_text": "בקש ממשתמש זה לאמת את ההתחברות שלו, או לאמת אותה באופן ידני למטה.",
@@ -736,11 +717,7 @@
             "title": "לא ניתן להעתיק קישור לחדר"
         },
         "error_loading_user_profile": "לא ניתן לטעון את פרופיל המשתמש",
-        "forget_room_failed": "נכשל בעת בקשה לשכוח חדר %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "יתכן שהשרת לא יהיה זמין, עמוס יתר על המידה או שתם הזמן הקצוב לחיפוש :(",
-            "title": "החיפוש נכשל"
-        }
+        "forget_room_failed": "נכשל בעת בקשה לשכוח חדר %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1176,11 +1153,6 @@
         "ongoing": "מסיר…",
         "reason_label": "סיבה (לא חובה)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "האם אתם בטוחים שברצונכם לדחות את ההזמנה?",
-        "failed": "דחיית ההזמנה נכשלה",
-        "title": "דחה הזמנה"
-    },
     "report_content": {
         "description": "דיווח על הודעה זו ישלח את 'מזהה האירוע' הייחודי למנהל שרת הבית שלך. אם הודעות בחדר זה מוצפנות, מנהל שרת הבית שלך לא יוכל לקרוא את טקסט ההודעה או להציג קבצים או תמונות.",
         "missing_reason": "אנא מלאו מדוע אתם מדווחים.",
@@ -1267,7 +1239,6 @@
             "you_created": "אתם יצרתם את החדר הזה."
         },
         "invite_email_mismatch_suggestion": "שתף דוא\"ל זה בהגדרות כדי לקבל הזמנות ישירות ב-%(brand)s.",
-        "invite_reject_ignore": "דחה והתעלם ממשתמש זה",
         "invite_sent_to_email_room": "הזמנה לחדר %(roomName)s נשלחה לכתובת %(email)s",
         "invite_subtitle": "<userName/> הזמין אתכם",
         "invite_this_room": "הזמן לחדר זה",
@@ -1644,7 +1615,6 @@
             "remove_email_prompt": "הסר כתובות %(email)s ?",
             "remove_msisdn_prompt": "הסר מספרי %(phone)s ?"
         },
-        "image_thumbnails": "הראה תצוגה מקדימה\\ממוזערת של תמונות",
         "inline_url_previews_default": "אפשר צפייה של תצוגת קישורים בצאט כברירת מחדל",
         "inline_url_previews_room": "אפשר לחברים בחדר זה לצפות בתצוגת קישורים",
         "inline_url_previews_room_account": "הראה תצוגה מקדימה של קישורים בחדר זה (משפיע רק עליכם)",
@@ -1735,48 +1705,16 @@
         "prompt_invite": "שאלו אותי לפני שאתם שולחים הזמנה אל קוד זיהוי אפשרי של משתמש מערכת",
         "replace_plain_emoji": "החלף טקסט עם סמל באופן אוטומטי",
         "security": {
-            "4s_public_key_in_account_data": "במידע בחשבון",
-            "4s_public_key_status": "מקום שמירה סודי של המפתח הציבורי:",
-            "backup_key_cached_status": "גבה מפתח במטמון:",
-            "backup_key_stored_status": "גבה מפתח שמור:",
-            "backup_key_unexpected_type": "סוג בלתי צפוי",
-            "backup_key_well_formed": "מעוצב היטב",
-            "backup_keys_description": "גבה את מפתחות ההצפנה שלך עם נתוני חשבונך במקרה שתאבד את הגישה להפעלות שלך. המפתחות שלך מאובטחים באמצעות מפתח אבטחה ייחודי.",
             "bulk_options_accept_all_invites": "קבל את כל ההזמנות של %(invitedRooms)s",
             "bulk_options_reject_all_invites": "דחה את כל ההזמנות של %(invitedRooms)s",
             "bulk_options_section": "אפשרויות בתפזורת",
-            "cross_signing_cached": "אוחסן מקומי",
-            "cross_signing_homeserver_support": "תמיכה שרת:",
-            "cross_signing_homeserver_support_exists": "קיים",
-            "cross_signing_in_4s": "באחסון סודי",
-            "cross_signing_in_memory": "בזכרון",
-            "cross_signing_master_private_Key": "מפתח מאסטר פרטי:",
-            "cross_signing_not_cached": "לא נמצא באחסון מקומי",
-            "cross_signing_not_found": "לא נמצא",
-            "cross_signing_not_in_4s": "לא נמצא באחסון",
-            "cross_signing_not_stored": "לא שמור",
-            "cross_signing_private_keys": "מפתחות פרטיים של חתימה צולבת:",
-            "cross_signing_public_keys": "מפתחות ציבוריים של חתימה צולבת:",
-            "cross_signing_self_signing_private_key": "מפתח פרטי ברישום עצמאי:",
-            "cross_signing_user_signing_private_key": "משתמש חותם על מפתח פרטי:",
-            "cryptography_section": "קריפטוגרפיה",
-            "delete_backup": "מחק גיבוי",
-            "delete_backup_confirm_description": "האם אתה בטוח? תאבד את ההודעות המוצפנות שלך אם המפתחות שלך לא מגובים כראוי.",
             "e2ee_default_disabled_warning": "מנהל השרת שלך השבית הצפנה מקצה לקצה כברירת מחדל בחדרים פרטיים ובהודעות ישירות.",
             "enable_message_search": "אפשר חיפוש הודעות בחדרים מוצפנים",
             "encryption_section": "הצפנה",
-            "error_loading_key_backup_status": "לא ניתן לטעון את מצב גיבוי המפתח",
-            "export_megolm_keys": "ייצא מפתחות חדר E2E",
             "ignore_users_empty": "אין לך משתמשים שהתעלמו מהם.",
             "ignore_users_section": "משתמשים שהתעלמתם מהם",
-            "import_megolm_keys": "ייבא מפתחות לחדר E2E",
-            "key_backup_active_version_none": "ללא",
             "key_backup_algorithm": "אלגוריתם:",
-            "key_backup_complete": "כל המפתחות מגובים",
             "key_backup_connect": "חבר את התחברות הזו לגיבוי מפתח",
-            "key_backup_connect_prompt": "חבר את ההפעלה הזו לגיבוי המפתח לפני היציאה, כדי למנוע אובדן מפתחות שיכולים להיות רק בפגישה זו.",
-            "key_backup_inactive": "הפעלה זו <b> אינה מגבה את המפתחות שלך </b>, אך יש לך גיבוי קיים ממנו תוכל לשחזר ולהוסיף להמשך.",
-            "key_backup_inactive_warning": "המפתחות שלך <b> אינם מגובים מהתחברות זו </b>.",
             "message_search_disable_warning": "אם מושבת, הודעות מחדרים מוצפנים לא יופיעו בתוצאות החיפוש.",
             "message_search_disabled": "שמור באופן מאובטח הודעות מוצפנות באופן מקומי כדי שיופיעו בתוצאות החיפוש.",
             "message_search_enabled": {
@@ -1795,13 +1733,7 @@
             "message_search_space_used": "שטח משומש:",
             "message_search_unsupported": "%(brand)s חסרים כמה רכיבים הנדרשים לצורך אחסון במטמון מאובטח של הודעות מוצפנות באופן מקומי. אם תרצה להתנסות בתכונה זו, בנה %(brand)s מותאם אישית לדסקטום עם <nativeLink>חפש רכיבים להוספה</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s אינם יכולים לשמור במטמון מאובטח הודעות מוצפנות באופן מקומי בזמן שהם פועלים בדפדפן אינטרנט. השתמש ב- <desktopLink>%(brand)s Desktop </desktopLink> כדי שהודעות מוצפנות יופיעו בתוצאות החיפוש.",
-            "restore_key_backup": "שחזר מגיבוי",
-            "secret_storage_not_ready": "לא מוכן",
-            "secret_storage_ready": "מוכן",
-            "secret_storage_status": "אחסון סודי:",
             "send_analytics": "שלח מידע אנליטי",
-            "session_id": "מזהה מושב:",
-            "session_key": "מפתח מושב:",
             "strict_encryption": "לעולם אל תשלח הודעות מוצפנות אל התחברות שאינה מאומתת מהתחברות זו"
         },
         "send_read_receipts": "שילחו אישורי קריאה",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 0a1c201a10..daf0f52d4c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -12,6 +12,16 @@
             "1 olvasatlan megemlítés.": "one"
         },
         "recent_rooms": "Legutóbbi szobák",
+        "room_messsage_not_sent": "A(z) %(roomName)s szoba megnyitása nem beállított üzenettel.",
+        "room_n_unread_invite": "A(z) %(roomName)s szoba meghívásának megnyitása.",
+        "room_n_unread_messages": {
+            "A(z) %(roomName)s szoba megnyitása 1 olvasatlan üzenettel.": "one",
+            "A(z) %(roomName)s szoba megnyitása %(count)s olvasatlan üzenettel.": "other"
+        },
+        "room_n_unread_messages_mentions": {
+            "A(z) %(roomName)s szoba megnyitása 1 olvasatlan megemlítéssel.": "one",
+            "A(z) %(roomName)s szoba megnyitása %(count)s olvasatlan megemlítéssel.": "other"
+        },
         "room_name": "Szoba: %(name)s",
         "room_status_bar": "Szoba állapotsora",
         "seek_bar_label": "Hang keresősávja",
@@ -45,6 +55,8 @@
         "create_a_room": "Szoba létrehozása",
         "create_account": "Fiók létrehozása",
         "decline": "Elutasítás",
+        "decline_and_block": "Elutasítás és letiltás",
+        "decline_invite": "Meghívás elutasítása",
         "delete": "Törlés",
         "deny": "Megtagadás",
         "disable": "Tiltás",
@@ -97,7 +109,6 @@
         "react": "Reakció",
         "refresh": "Frissítés",
         "register": "Regisztráció",
-        "reject": "Elutasítás",
         "reload": "Újratöltés",
         "remove": "Eltávolítás",
         "rename": "Átnevezés",
@@ -146,6 +157,7 @@
         "view_message": "Üzenet megjelenítése",
         "view_source": "Forrás megjelenítése",
         "yes": "Igen",
+        "yes_dismiss": "Igen, elvetés",
         "zoom_in": "Nagyítás",
         "zoom_out": "Kicsinyítés"
     },
@@ -303,12 +315,12 @@
             "confirm_new_password": "Új jelszó megerősítése",
             "devices_logout_success": "Az összes eszközéről kijelentkezett és leküldéses értesítéseket sem fog kapni. Az értesítések újbóli engedélyezéséhez újra be kell jelentkezni az egyes eszközökön.",
             "other_devices_logout_warning_1": "A kijelentkezéssel az üzeneteket titkosító kulcsokat az eszközök törlik magukról ami elérhetetlenné teheti a régi titkosított csevegéseket.",
-            "other_devices_logout_warning_2": "Ha szeretné megtartani a hozzáférést a titkosított szobákban lévő csevegésekhez, állítson be Kulcs mentést vagy exportálja ki a kulcsokat valamelyik eszközéről mielőtt továbblép.",
+            "other_devices_logout_warning_2": "Ha szeretné megtartani a hozzáférést a titkosított szobákban lévő csevegésekhez, állítson be kulcsmentést vagy exportálja a kulcsokat valamelyik eszközéről mielőtt továbblép.",
             "password_not_entered": "Új jelszót kell megadni.",
             "passwords_mismatch": "Az új jelszavaknak meg kell egyezniük egymással.",
             "rate_limit_error": "Rövid idő alatt túl sok próbálkozás. Várjon egy kicsit mielőtt újra próbálkozik.",
             "rate_limit_error_with_time": "Rövid idő alatt túl sok próbálkozás. Próbálkozzon ennyi idő múlva: %(timeout)s.",
-            "reset_successful": "A jelszava alaphelyzetbe lett állítva.",
+            "reset_successful": "A jelszava vissza lett állítva.",
             "return_to_login": "Vissza a bejelentkezési képernyőre",
             "sign_out_other_devices": "Kijelentkezés az összes eszközről"
         },
@@ -318,7 +330,7 @@
         "reset_password_email_field_required_invalid": "E-mail-cím megadása (ezen a Matrix-kiszolgálón kötelező)",
         "reset_password_email_not_associated": "Úgy tűnik, hogy ez az e-mail-cím nincs összekötve Matrix-azonosítóval ezen a Matrix-kiszolgálón.",
         "reset_password_email_not_found_title": "Az e-mail-cím nem található",
-        "reset_password_title": "Jelszó megváltoztatása",
+        "reset_password_title": "Jelszó visszaállítása",
         "server_picker_custom": "Másik Matrix-kiszolgáló",
         "server_picker_description": "Használhatja az egyéni kiszolgáló lehetőséget, hogy egy másik Matrix-kiszolgáló címének megadásával jelentkezzen be. Ezzel használhatja az %(brand)s klienst egy már létező Matrix-fiókkal, egy másik Matrix-kiszolgálón.",
         "server_picker_description_matrix.org": "Csatlakozzon több millió felhasználóhoz ingyen, a legnagyobb nyilvános kiszolgálón",
@@ -374,7 +386,8 @@
             "email_resent": "Újraküldve!",
             "fallback_button": "Hitelesítés indítása",
             "mas_cross_signing_reset_cta": "Ugrás a fiókjához",
-            "mas_cross_signing_reset_description": "Állítsa vissza személyazonosságát a fiókszolgáltatón keresztül, majd térjen vissza, és kattintson az „Újra próbálkozás” gombra.",
+            "mas_cross_signing_reset_description": "Állítsa alaphelyzetbe személyazonosságát a fiókszolgáltatón keresztül, majd térjen vissza, és kattintson az „Újra” gombra.",
+            "mas_cross_signing_reset_title": "Ugorjon a fiókjához a személyazonossága alaphelyzetbe állításához",
             "msisdn": "Szöveges üzenet küldve ide: %(msisdn)s",
             "msisdn_token_incorrect": "Helytelen token",
             "msisdn_token_prompt": "Adja meg a benne lévő kódot:",
@@ -396,7 +409,7 @@
         "unsupported_auth_msisdn": "Ez a kiszolgáló nem támogatja a telefonszámmal történő hitelesítést.",
         "username_field_required_invalid": "Felhasználónév megadása",
         "username_in_use": "Ez a felhasználónév már foglalt, próbáljon ki másikat.",
-        "verify_email_explainer": "Mielőtt beállíthatja a jelszót, tudnunk kell, hogy tényleg az, akinek mondja magát. Kattintson a hivatkozásra az e-mailben, melyet épp most küldtünk ide: <b>%(email)s</b>",
+        "verify_email_explainer": "Mielőtt visszaállíthatja a jelszót, tudnunk kell, hogy tényleg az, akinek mondja magát. Kattintson a hivatkozásra az e-mailben, melyet épp most küldtünk ide: <b>%(email)s</b>",
         "verify_email_heading": "Erősítse meg az e-mailt a továbblépéshez"
     },
     "bug_reporting": {
@@ -409,12 +422,12 @@
         "download_logs": "Naplók letöltése",
         "downloading_logs": "Naplók letöltése folyamatban",
         "error_empty": "Mondja el nekünk, hogy mi az, ami nem működött, vagy még jobb, ha egy GitHub-jegyben írja le a problémát.",
-        "failed_download_logs": "A hibakeresési naplók letöltése sikertelen: ",
+        "failed_download_logs": "Nem sikerült letölteni a hibakeresési naplókat: ",
         "failed_send_logs_causes": {
             "disallowed_app": "A hibajelentését elutasították. A rageshake kiszolgáló nem támogatja ezt az alkalmazást.",
-            "rejected_generic": "A hibajelentését elutasították. A rageshake kiszolgáló egy irányelv miatt elutasította a jelentés tartalmát.",
-            "rejected_recovery_key": "A hibajelentését biztonsági okokból elutasították, mivel helyreállítási kulcsot tartalmazott.",
-            "rejected_version": "A hibajelentését elutasították, mivel a futtatott verziója túl régi.",
+            "rejected_generic": "A hibajelentését elutasították. A rageshake kiszolgáló egy házirend miatt elutasította a jelentés tartalmát.",
+            "rejected_recovery_key": "A hibajelentést biztonsági okokból elutasították, mivel helyreállítási kulcsot tartalmazott.",
+            "rejected_version": "Hibajelentését elutasították, mivel az Ön által használt verzió túl régi.",
             "server_unknown_error": "A rageshake kiszolgáló ismeretlen hibát észlelt, és nem tudta kezelni a jelentést.",
             "unknown_error": "A naplók elküldése sikertelen."
         },
@@ -476,7 +489,6 @@
         "capabilities": "Képességek",
         "copied": "Másolva!",
         "credits": "Közreműködők",
-        "cross_signing": "Eszközök közti hitelesítés",
         "dark": "Sötét",
         "description": "Leírás",
         "deselect_all": "Kijelölés megszüntetése",
@@ -515,6 +527,7 @@
         "message_timestamp_invalid": "Érvénytelen időbélyeg",
         "microphone": "Mikrofon",
         "model": "Modell",
+        "moderation_and_safety": "Moderálás és biztonság",
         "modern": "Modern",
         "mute": "Némítás",
         "n_members": {
@@ -734,6 +747,13 @@
         "twemoji": "A <twemoji>Twemoji</twemoji> emodzsikra a következő vonatkozik: © <author>Twitter, Inc. és egyéb közreműködők</author>, a <terms>CC-BY 4.0</terms> licenc feltételei szerint használva.",
         "twemoji_colr": "A <colr>twemoji-colr</colr> betűkészletre a következő vonatkozik: © <author>Mozilla Foundation</author>, az <terms>Apache 2.0</terms> licenc feltételei szerint használva."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Biztos, hogy elutasítja a(z) „%(roomName)s” szobába való meghívást?",
+        "ignore_user_help": "Ettől a felhasználótól nem fog többé üzeneteket vagy meghívásokat látni.",
+        "reason_description": "Írja le a szoba jelentésének okát.",
+        "report_room_description": "A szoba jelentése a fiókszolgáltatójának.",
+        "title": "Meghívás elutasítása"
+    },
     "desktop_default_device_name": "Asztali %(brand)s: (%(platformName)s)",
     "devtools": {
         "active_widgets": "Aktív kisalkalmazások",
@@ -833,6 +853,9 @@
         "setting_colon": "Beállítás:",
         "setting_definition": "Beállítás leírása:",
         "setting_id": "Beállításazonosító",
+        "settings": {
+            "elementCallUrl": "Element Call webcím"
+        },
         "settings_explorer": "Beállításböngésző",
         "show_hidden_events": "Rejtett események megjelenítése az idővonalon",
         "spaces": {
@@ -885,44 +908,24 @@
     "empty_room_was_name": "Üres szoba (%(oldName)s volt)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Adja meg a biztonsági jelmondatot vagy <button>használja a helyreállítási kulcsot</button> a folytatáshoz.",
             "key_validation_text": {
-                "invalid_security_key": "Érvénytelen helyreállítási kulcs",
-                "recovery_key_is_correct": "Jónak tűnik!",
-                "wrong_file_type": "A fájltípus hibás",
-                "wrong_security_key": "Hibás helyreállítási kulcs"
+                "wrong_security_key": "A megadott helyreállítási kulcs helytelen."
             },
-            "reset_title": "Minden alaphelyzetbe állítása",
-            "reset_warning_1": "Csak akkor tegye meg, ha egyetlen másik eszköze sincs az ellenőrzés elvégzéséhez.",
-            "reset_warning_2": "Ha mindent alaphelyzetbe állít, akkor nem lesz megbízható munkamenete, nem lesznek megbízható felhasználók és a régi üzenetekhez sem biztos, hogy hozzáfér majd.",
+            "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_phrase_incorrect_error": "A biztonsági tárolóhoz nem lehet hozzáférni. Kérjük ellenőrizze, hogy jó Biztonsági jelmondatot adott-e meg.",
-            "security_phrase_title": "Biztonsági jelmondat",
-            "separator": "%(securityKey)s vagy %(recoveryFile)s",
-            "use_security_key_prompt": "A folytatáshoz használja a helyreállítási kulcsot."
+            "security_key_title": "Helyreállítási kulcs"
         },
         "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_not_ready": "Az eszközök közti hitelesítés nincs beállítva.",
-        "cross_signing_ready": "Az eszközök közti hitelesítés használatra kész.",
-        "cross_signing_ready_no_backup": "Az eszközök közti hitelesítés készen áll, de a kulcsokról nincs biztonsági mentés.",
         "cross_signing_room_normal": "Ez a szoba végpontok közti titkosítást használ",
         "cross_signing_room_verified": "A szobában mindenki ellenőrizve van",
         "cross_signing_room_warning": "Valaki ellenőrizetlen munkamenetet használ",
-        "cross_signing_unsupported": "A Matrix-kiszolgálója nem támogatja az eszközök közti hitelesítést.",
-        "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.",
         "cross_signing_user_normal": "Még nem ellenőrizte ezt a felhasználót.",
         "cross_signing_user_verified": "Ellenőrizte ezt a felhasználót. Ez a felhasználó ellenőrizte az összes munkamenetét.",
         "cross_signing_user_warning": "Ez a felhasználó még nem ellenőrizte az összes munkamenetét.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Eszközök közti hitelesítési kulcsok törlése",
-            "title": "Megsemmisíti az eszközök közti hitelesítési kulcsokat?",
-            "warning": "Az eszközök közti hitelesítési kulcsok törlése végleges. Mindenki, akit ezzel a kulccsal ellenőrzött, biztonsági figyelmeztetéseket fog látni. Hacsak nem vesztette el az összes eszközét, amellyel eszközök közti hitelesítést tud végezni, akkor nem valószínű, hogy ezt szeretné tenni."
-        },
         "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_key": "Ellenőrizetlen munkamenet által titkosítva",
@@ -949,7 +952,6 @@
             "title": "Új helyreállítási mód",
             "warning": "Ha nem Ön állította be az új helyreállítási módot, akkor lehet, hogy egy támadó próbálja elérni a fiókját. Változtassa meg a fiókja jelszavát, és amint csak lehet, állítsa be az új helyreállítási módot a Beállításokban."
         },
-        "not_supported": "<nem támogatott>",
         "pinned_identity_changed": "Úgy tűnik, hogy %(displayName)s (<b>%(userId)s</b>) személyazonossága megváltozott. <a>További információ</a>",
         "pinned_identity_changed_no_displayname": "Úgy tűnik, hogy <b>%(userId)s</b> személyazonossága megváltozott. <a>További információ</a>",
         "recovery_method_removed": {
@@ -965,9 +967,10 @@
         "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.",
-            "title": "Beállítás"
+            "explainer": "Mentse a kulcsait a kiszolgálóra kijelentkezés előtt, hogy ne veszítse el azokat."
         },
+        "turn_on_key_storage": "A kulcstárolás bekapcsolása",
+        "turn_on_key_storage_description": "Tárolja biztonságosan a kriptográfiai azonosító- és üzenetkulcsokat a kiszolgálón. Ez lehetővé teszi az üzenetek előzményeinek megtekintését bármely új eszközön.",
         "udd": {
             "interactive_verification_button": "Interaktív ellenőrzés emodzsikkal",
             "other_ask_verify_text": "Kérje meg a felhasználót, hogy hitelesítse a munkamenetét, vagy ellenőrizze kézzel lentebb.",
@@ -981,7 +984,6 @@
             "accepting": "Elfogadás…",
             "after_new_login": {
                 "device_verified": "Eszköz ellenőrizve",
-                "reset_confirmation": "Biztos, hogy lecseréli az ellenőrzési kulcsokat?",
                 "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"
@@ -1052,8 +1054,6 @@
             "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_reset_warning_1": "Az ellenőrzéshez használt kulcsok alaphelyzetbe állítását nem lehet visszavonni. A visszaállítás után nem fog hozzáférni a régi titkosított üzenetekhez, és minden ismerőse, aki eddig ellenőrizte a személyazonosságát, biztonsági figyelmeztetést fog látni, amíg újra nem ellenőrzi.",
-            "verify_reset_warning_2": "Csak akkor folytassa, ha biztos benne, hogy elvesztette a hozzáférést a többi eszközéhez és helyreállítási kulcsához.",
             "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",
@@ -1122,11 +1122,7 @@
             "title": "A szoba hivatkozása nem másolható"
         },
         "error_loading_user_profile": "A felhasználói profil nem tölthető be",
-        "forget_room_failed": "A szobát nem sikerült elfelejtetni: %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "A kiszolgáló elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
-            "title": "Keresés sikertelen"
-        }
+        "forget_room_failed": "A szobát nem sikerült elfelejtetni: %(errCode)s"
     },
     "error_user_not_logged_in": "A felhasználó nincs bejelentkezve",
     "event_preview": {
@@ -1512,7 +1508,7 @@
         "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.",
-        "sliding_sync": "Csúszó szinkronizációs mód",
+        "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",
         "sliding_sync_server_no_support": "A kiszolgálója nem támogatja",
@@ -1655,6 +1651,7 @@
         "class_global": "Globális",
         "class_other": "Egyéb",
         "default": "Alapértelmezett",
+        "default_settings": "Megegyezik az alapértelmezett beállításokkal",
         "email_pusher_app_display_name": "E-mail értesítések",
         "enable_prompt_toast_description": "Asztali értesítések engedélyezése",
         "enable_prompt_toast_title": "Értesítések",
@@ -1673,7 +1670,8 @@
         "mentions_and_keywords_description": "Értesítések fogadása csak megemlítéseknél és kulcsszavaknál, a <a>beállításokban</a> megadottak szerint",
         "mentions_keywords": "Megemlítések és kulcsszavak",
         "message_didnt_send": "Az üzenet nincs elküldve. Kattintson az információkért.",
-        "mute_description": "Nem kap semmilyen értesítést"
+        "mute_description": "Nem kap semmilyen értesítést",
+        "mute_room": "Szoba némítása"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s ellenőrzést kér"
@@ -1773,11 +1771,6 @@
         "ongoing": "Eltávolítás…",
         "reason_label": "Ok (nem kötelező)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Biztos, hogy elutasítja a meghívást?",
-        "failed": "A meghívót nem sikerült elutasítani",
-        "title": "Meghívó elutasítása"
-    },
     "report_content": {
         "description": "Az üzenet bejelentése egy egyedi „eseményazonosítót” küld el a Matrix-kiszolgáló adminisztrátorának. Ha az üzenetek titkosítottak a szobában, akkor a Matrix-kiszolgáló adminisztrátora nem tudja elolvasni az üzenetet, vagy nem tudja megnézni a fájlokat vagy képeket.",
         "disagree": "Nem értek egyet",
@@ -1801,10 +1794,8 @@
         "toxic_behaviour": "Mérgező viselkedés"
     },
     "report_room": {
-        "description": "A szoba jelentése a Matrix-kiszolgáló rendszergazdájának. Ez elküldi a szoba egyedi azonosítóját, de ha az üzenetek titkosítva vannak, a rendszergazda nem fogja tudni elolvasni azokat, vagy megtekinteni a megosztott fájlokat.",
-        "reason_placeholder": " A jelentés oka…",
-        "sent": "A jelentés elküldve.",
-        "title": "Szoba jelentése"
+        "description": "A szoba jelentése a Matrix-kiszolgáló rendszergazdájának. Ha az üzenetek titkosítva vannak, a rendszergazda nem fogja tudni elolvasni azokat.",
+        "reason_label": "Írja le az okot"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "%(failedCount)s munkamenetet nem lehet visszafejteni!",
@@ -1967,7 +1958,7 @@
         "inaccessible": "Ez a szoba vagy tér jelenleg elérhetetlen.",
         "inaccessible_name": "%(roomName)s jelenleg nem érhető el.",
         "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": "Amikor a szobát vagy teret próbáltuk elérni ezt a hibaüzenetet kaptuk: %(errcode)s. Ha úgy gondolja, hogy ez egy hiba legyen szíves<issueLink>nyisson egy hibajegyet</issueLink>.",
+        "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": {
             "dm_caption": "Csak önök ketten vannak ebben a beszélgetésben, hacsak valamelyikőjük nem hív meg valakit, hogy csatlakozzon.",
             "enable_encryption_prompt": "Titkosítás bekapcsolása a beállításokban.",
@@ -1986,7 +1977,6 @@
             "you_created": "Te készítetted 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_reject_ignore": "Felhasználó elutasítása és figyelmen kívül hagyása",
         "invite_sent_to_email": "Ez a meghívó ide lett küldve: %(email)s",
         "invite_sent_to_email_room": "A meghívó ehhez a szobához: %(roomName)s ide lett elküldve: %(email)s",
         "invite_subtitle": "Meghívta: <userName/>",
@@ -2038,7 +2028,7 @@
             "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 rögzített %(length)s </bold> üzenetből"
+            "title": "<bold>%(index)s. / %(length)s </bold> rögzített üzenet"
         },
         "read_topic": "Kattintson a téma elolvasásához",
         "rejecting": "Meghívó elutasítása…",
@@ -2058,7 +2048,7 @@
             "homeserver_blocked": "Az üzenete nem lett elküldve, mert a Matrix-kiszolgáló adminisztrátora letiltotta. A szolgáltatás használatának folytatásához <a>vegye fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
             "monthly_user_limit_reached": "Az üzenete nem lett elküldve, mert ez a Matrix-kiszolgáló elérte a havi aktív felhasználói korlátot. A szolgáltatás használatának folytatásához <a>vegye fel a kapcsolatot a szolgáltatás adminisztrátorával</a>.",
             "requires_consent_agreement": "Nem tudsz üzenetet küldeni amíg nem olvasod el és nem fogadod el a <consentLink>felhasználási feltételeket</consentLink>.",
-            "retry_all": "Mind újraküldése",
+            "retry_all": "Összes újraküldése",
             "select_messages_to_retry": "Újraküldéshez vagy törléshez kiválaszthatja az üzeneteket egyenként vagy az összeset együtt",
             "server_connectivity_lost_description": "Az elküldött üzenetek tárolva lesznek, amíg a kapcsolata újra elérhető nem lesz.",
             "server_connectivity_lost_title": "A kapcsolat megszakadt a kiszolgálóval.",
@@ -2080,6 +2070,7 @@
             },
             "uploading_single_file": "%(filename)s feltöltése"
         },
+        "video_room": "Ez a szoba egy videószoba",
         "waiting_for_join_subtitle": "Miután a meghívott felhasználók csatlakoztak ide: %(brand)s, beszélgethet, és a szoba végponttól végpontig titkosítva lesz",
         "waiting_for_join_title": "Várakozás a felhasználók csatlakozására ide: %(brand)s"
     },
@@ -2094,11 +2085,14 @@
             "no_chats_description_no_room_rights": "Kezdje azzal, hogy üzenetet küld valakinek",
             "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_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",
             "no_rooms": "Még nincs egy szobában sem",
             "no_rooms_description": "Kikapcsolhatja a szűrőket a többi csevegés megtekintéséhez",
             "no_unread": "Gratulálunk! Nincsenek olvasatlan üzenetei.",
+            "show_activity": "Összes tevékenység megtekintése",
             "show_chats": "Összes csevegés megjelenítése"
         },
         "failed_add_tag": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
@@ -2106,6 +2100,8 @@
         "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",
+            "mentions": "Említések",
             "people": "Emberek",
             "rooms": "Szobák",
             "unread": "Olvasatlan"
@@ -2134,14 +2130,20 @@
             "more_options": "További lehetőségek",
             "open_room": "A(z) %(roomName)s szoba megnyitása"
         },
+        "room_options": "Szobabeállítások",
         "show_less": "Kevesebb megjelenítése",
         "show_n_more": {
             "Még %(count)s megjelenítése": "one"
         },
         "show_previews": "Üzenet-előnézet megjelenítése",
+        "sort": "Rendezés",
         "sort_by": "Rendezés",
         "sort_by_activity": "Aktivitás",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Tevékenység",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Olvasatlan üzeneteket tartalmazó szobák megjelenítése elöl",
         "space_menu": {
             "home": "Tér kezdőlapja",
@@ -2374,7 +2376,7 @@
             "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.",
-            "strict_encryption": "Ebben a szobában sose küldjön titkosított üzenetet ellenőrizetlen munkamenetekbe ebből a munkamenetből",
+            "strict_encryption": "Üzenetküldés csak ellenőrzött felhasználóknak",
             "title": "Biztonság és adatvédelem"
         },
         "title": "Szoba beállításai – %(roomName)s",
@@ -2428,6 +2430,10 @@
         "recent_changes_heading": "A legutóbbi változások, amelyek még nem érkeztek meg",
         "title": "A kiszolgáló nem válaszol"
     },
+    "service_worker_error": {
+        "description": "Az %(brand)s ún. service workert igényel a hitelesített médiafájlok Matrix tartalomtárolókból történő betöltéséhez. Ezt a böngészője nem támogatja, ezért előfordulhat, hogy a médiafájlok nem töltődnek be.",
+        "title": "Nem sikerült betölteni a service workert"
+    },
     "seshat": {
         "error_initialising": "Az üzenetkeresés előkészítése sikertelen, további információkért ellenőrizze a <a>beállításait</a>",
         "reset_button": "Az eseménytároló alaphelyzetbe állítása",
@@ -2505,14 +2511,15 @@
                 "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_forgot": "Elfelejtette a helyreállítási kulcsot? Újra be 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.",
                 "details_title": "Titkosítás részletei",
                 "do_not_close_warning": "Ne zárja be ezt az ablakot, amíg az alaphelyzetbe állítás be nem fejeződik",
                 "export_keys": "Kulcsok exportálása",
                 "import_keys": "Kulcsok importálása",
-                "other_people_device_description": "Alapértelmezés szerint titkosított szobákban ne küldjön titkosított üzeneteket senkinek, amíg nem ellenőrizte őket.",
-                "other_people_device_label": "Sose küldjön titkosított üzeneteket nem ellenőrzött eszközökre",
+                "other_people_device_description": "Figyelmeztetés: azok a felhasználók, akikkel nem ellenőrizték kölcsönösen egymást (például emodzsik használatával), nem kapják meg a titkosított üzeneteket. Ezenkívül az ellenőrzött felhasználók nem ellenőrzött eszközei sem kapják meg a titkosított üzeneteket.",
+                "other_people_device_label": "Titkosított szobákban csak az ellenőrzött felhasználók kapják meg az üzeneteket",
                 "other_people_device_title": "Mások eszközei",
                 "reset_identity": "Kriptográfiai személyazonosság alaphelyzetbe állítása",
                 "reset_in_progress": "Alaphelyzetbe állítás folyamatban…",
@@ -2520,12 +2527,14 @@
                 "session_key": "Munkamenetkulcs:",
                 "title": "Speciális"
             },
+            "confirm_key_storage_off": "Biztosan kikapcsolva szeretné tartani a kulcstárolást?",
+            "confirm_key_storage_off_description": "Ha kijelentkezik az összes eszközéről, elveszíti üzenetelőzményeit, és újra ellenőriznie kell az összes meglévő kapcsolatát. <a>Tudjon meg többet</a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Kulcstároló törlése",
                 "confirm": "Kulcstároló törlése",
-                "description": "A kulcstároló törlése eltávolítja a kriptográfiai személyazonosságát és üzenetkulcsait a kiszolgálóról, és kikapcsolja a következő biztonsági funkciókat:",
+                "description": "A kulcstároló törlése eltávolítja a kriptográfiai személyazonosságát és üzenetkulcsát a kiszolgálóról, és kikapcsolja a következő biztonsági funkciókat:",
                 "list_first": "Nem lesznek meg a titkosított üzenetek előzményei az új eszközein",
-                "list_second": "Elveszíti a titkosított üzenetekhez való hozzáférését, ha mindenhol kijelentkezik az %(brand)sből.",
+                "list_second": "Elveszíti hozzáférését titkosított üzeneteihez, ha mindenhol kijelentkezett az %(brand)sből.",
                 "title": "Biztos, hogy kikapcsolja a kulcstárolót és törli azt?"
             },
             "device_not_verified_button": "Az eszköz ellenőrzése",
@@ -2534,7 +2543,7 @@
             "dialog_title": "<strong>Beállítások:</strong> Titkosítás",
             "key_storage": {
                 "allow_key_storage": "Kulcstárolás engedélyezése",
-                "description": "Tárolja biztonságosan a kriptográfiai személyazonosságát és az üzenetkulcsokat a kiszolgálón. Ez lehetővé teszi az üzenetek előzményeinek megtekintését bármely új eszközön. <a>További információk</a>",
+                "description": "Tárolja biztonságosan a kriptográfiai személyazonosságát és az üzenetkulcsait a kiszolgálón. Ez lehetővé teszi az üzenetek előzményeinek megtekintését bármely új eszközön. <a>További információ</a>",
                 "title": "Kulcstároló"
             },
             "recovery": {
@@ -2605,6 +2614,7 @@
             "discovery_needs_terms_title": "Hagyja, hogy mások megtalálhassák",
             "display_name": "Megjelenítendő név",
             "display_name_error": "Nem sikerült beállítani a megjelenítési nevet",
+            "email_adding_unsupported_by_hs": "Ez a Matrix-kiszolgáló nem támogatja az e-mail-címek hozzáadását a fiókjához.",
             "email_address_in_use": "Ez az e-mail-cím már használatban van",
             "email_address_label": "E-mail cím",
             "email_not_verified": "Az e-mail-címe még nincs ellenőrizve",
@@ -2629,7 +2639,9 @@
             "error_share_msisdn_discovery": "A telefonszámot nem sikerült megosztani",
             "identity_server_no_token": "Nem található személyazonosság-hozzáférési kulcs",
             "identity_server_not_set": "Az azonosítási kiszolgáló nincs megadva",
+            "invalid_phone_number": "A megadott telefonszám nem tűnik érvényesnek.",
             "language_section": "Nyelv",
+            "msisdn_adding_unsupported_by_hs": "Ez a Matrix-kiszolgáló nem támogatja a telefonszámok hozzáadását a fiókjához.",
             "msisdn_in_use": "Ez a telefonszám már használatban van",
             "msisdn_label": "Telefonszám",
             "msisdn_verification_field_label": "Ellenőrző kód",
@@ -2648,18 +2660,16 @@
             "unable_to_load_msisdns": "Nem sikerült betölteni a telefonszámokat",
             "username": "Felhasználónév"
         },
-        "image_thumbnails": "Előnézet/bélyegkép megjelenítése a képekhez",
         "inline_url_previews_default": "Beágyazott webcím-előnézetek alapértelmezett engedélyezése",
         "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_avatars": "Azon szobák profilképének megjelenítése, melybe meghívták",
         "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": "Kulcs mentés sikertelen",
+            "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.",
@@ -2712,6 +2722,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Beállítások:</strong> Figyelmen kívül hagyott felhasználók"
         },
+        "media_preview": {
+            "hide_avatars": "A szoba és a meghívó profilképének elrejtése",
+            "hide_media": "Elrejtés mindig",
+            "media_preview_description": "A rejtett médiatartalmak koppintással jeleníthetők meg",
+            "media_preview_label": "Média megjelenítése az idővonalon",
+            "show_in_private": "Privát szobákban",
+            "show_media": "Megjelenítés mindig"
+        },
         "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)",
@@ -2797,57 +2815,20 @@
         "prompt_invite": "Kérdés a vélhetően hibás Matrix-azonosítóknak küldött meghívók elküldése előtt",
         "replace_plain_emoji": "Egyszerű szöveg automatikus cseréje emodzsira",
         "security": {
-            "4s_public_key_in_account_data": "fiókadatokban",
-            "4s_public_key_status": "Titkos tároló nyilvános kulcsa:",
             "analytics_description": "Anonim adatok megosztása, hogy segítsen nekünk azonosítani a problémákat. Semmi személyes. Nincs harmadik fél.",
-            "backup_key_cached_status": "Gyorsítótárazott mentési kulcs:",
-            "backup_key_stored_status": "Tárolt mentési kulcs:",
-            "backup_key_unexpected_type": "váratlan típus",
-            "backup_key_well_formed": "helyesen formázott",
-            "backup_keys_description": "Mentse el a titkosítási kulcsokat a fiókadatokkal arra az esetre, ha elvesztené a hozzáférést a munkameneteihez. A kulcsok egy egyedi helyreállítási kulccsal lesznek védve.",
             "bulk_options_accept_all_invites": "Mind a(z) %(invitedRooms)s meghívó elfogadása",
             "bulk_options_reject_all_invites": "Mind a(z) %(invitedRooms)s meghívó elutasítása",
             "bulk_options_section": "Tömeges beállítások",
-            "cross_signing_cached": "helyben gyorsítótárazott",
-            "cross_signing_homeserver_support": "A Matrix-kiszolgáló funkciótámogatása:",
-            "cross_signing_homeserver_support_exists": "létezik",
-            "cross_signing_in_4s": "a biztonsági tárolóban",
-            "cross_signing_in_memory": "a memóriában",
-            "cross_signing_master_private_Key": "Elsődleges titkos kulcs:",
-            "cross_signing_not_cached": "nem található helyben",
-            "cross_signing_not_found": "nem találhatók",
-            "cross_signing_not_in_4s": "nem találhatók a tárolóban",
-            "cross_signing_not_stored": "nincs tárolva",
-            "cross_signing_private_keys": "Az eszközök közti hitelesítés titkos kulcsai:",
-            "cross_signing_public_keys": "Az eszközök közti hitelesítés nyilvános kulcsai:",
-            "cross_signing_self_signing_private_key": "Önaláíró titkos kulcs:",
-            "cross_signing_user_signing_private_key": "Felhasználó aláírási titkos kulcs:",
-            "cryptography_section": "Titkosítás",
             "dehydrated_device_description": "Az offline eszköz funkció lehetővé teszi titkosított üzenetek fogadását akkor is, ha nincs bejelentkezve egyetlen eszközre sem",
             "dehydrated_device_enabled": "Offline eszköz engedélyezve",
-            "delete_backup": "Mentés törlése",
-            "delete_backup_confirm_description": "Biztos benne? Ha a kulcsai nincsenek megfelelően mentve, akkor elveszíti a titkosított üzeneteit.",
             "dialog_title": "<strong>Beállítások:</strong> Biztonság és adatvédelem",
             "e2ee_default_disabled_warning": "A kiszolgáló rendszergazdája alapértelmezetten kikapcsolta a végpontok közti titkosítást a privát szobákban és a közvetlen beszélgetésekben.",
             "enable_message_search": "Üzenetek keresésének bekapcsolása a titkosított szobákban",
             "encryption_section": "Titkosítás",
-            "error_loading_key_backup_status": "A mentett kulcsok állapotát nem lehet betölteni",
-            "export_megolm_keys": "E2E szobakulcsok exportálása",
             "ignore_users_empty": "Nincsenek mellőzött felhasználók.",
             "ignore_users_section": "Mellőzött felhasználók",
-            "import_megolm_keys": "E2E szobakulcsok importálása",
-            "key_backup_active": "Ez a munkamenet elmenti a kulcsait.",
-            "key_backup_active_version": "Aktív biztonsági mentés verziója:",
-            "key_backup_active_version_none": "Semmi",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_can_be_restored": "Ez a biztonsági mentés visszaállítható ebben a munkameneten",
-            "key_backup_complete": "Az összes kulcs elmentve",
             "key_backup_connect": "Munkamenet csatlakoztatása a kulcsmentéshez",
-            "key_backup_connect_prompt": "Csatlakoztassa ezt a munkamenetet a kulcsmentéshez kijelentkezés előtt, hogy ne veszítsen el olyan kulcsot, amely lehet, hogy csak ezen az eszközön van meg.",
-            "key_backup_in_progress": "%(sessionsRemaining)s kulcs biztonsági mentése…",
-            "key_backup_inactive": "Ez az munkamenet <b>nem menti el a kulcsait</b>, de van létező mentése, amelyből helyre tudja állítani, és amelyhez hozzá tudja adni a továbbiakban.",
-            "key_backup_inactive_warning": "A kulcsai <b>nem kerülnek mentésre ebből a munkamenetből</b>.",
-            "key_backup_latest_version": "A legújabb biztonsági mentés verziója a kiszolgálón:",
             "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": {
@@ -2866,14 +2847,8 @@
             "message_search_unsupported": "A titkosított üzenetek biztonságos helyi tárolásához hiányzik néhány összetevő a(z) %(brand)s alkalmazásból. Ha kísérletezni szeretne ezzel a funkcióval, akkor állítson össze egy egyéni asztali %(brand)s alkalmazást, amely <nativeLink>tartalmazza a keresési összetevőket</nativeLink>.",
             "message_search_unsupported_web": "A(z) %(brand)s nem képes helyileg biztonságosan elmenteni a titkosított üzeneteket, ha webböngészőben fut. Használja az <desktopLink>asztali %(brand)s</desktopLink> alkalmazást, hogy az üzenetekben való kereséskor a titkosított üzenetek is megjelenjenek.",
             "record_session_details": "A kliens nevének, verziójának és webcímének felvétele a munkamenetek könnyebb felismerése érdekében a munkamenet-kezelőben",
-            "restore_key_backup": "Helyreállítás mentésből",
-            "secret_storage_not_ready": "nincs kész",
-            "secret_storage_ready": "kész",
-            "secret_storage_status": "Titkos tároló:",
             "send_analytics": "Analitikai adatok küldése",
-            "session_id": "Munkamenetazonosító:",
-            "session_key": "Munkamenetkulcs:",
-            "strict_encryption": "Sose küldjön titkosított üzenetet ellenőrizetlen munkamenetekbe ebből a munkamenetből"
+            "strict_encryption": "Üzenetküldés csak ellenőrzött felhasználóknak"
         },
         "send_read_receipts": "Olvasási visszajelzés küldése",
         "send_read_receipts_unsupported": "A kiszolgálója nem támogatja az olvasási visszajelzések elküldésének kikapcsolását.",
@@ -3112,8 +3087,6 @@
         "topic": "Lekérdezi vagy beállítja a szoba témáját",
         "topic_none": "A szobának nincs témája.",
         "topic_room_error": "A szoba téma nem található: A szoba nem található (%(roomId)s)",
-        "tovirtual": "Átváltás a szoba virtuális szobájába, ha létezik",
-        "tovirtual_not_found": "Ehhez a szobához nincs virtuális szoba",
         "unban": "Visszaengedi a megadott azonosítójú felhasználót",
         "unflip": "Az egyszerű szöveges üzenet elé teszi ezt: ┬──┬ ノ( ゜-゜ノ)",
         "unholdcall": "Visszaveszi tartásból a jelenlegi szoba hívását",
@@ -3235,7 +3208,7 @@
         "heading_without_query": "Keresés:",
         "join_button_text": "Belépés ide: %(roomAddress)s",
         "keyboard_scroll_hint": "Görgetés ezekkel: <arrows/>",
-        "message_search_section_title": "Más keresések",
+        "messages_label": "Üzenetek",
         "other_rooms_in_space": "Más szobák itt: %(spaceName)s",
         "public_rooms_label": "Nyilvános szobák",
         "public_spaces_label": "Nyilvános terek",
@@ -3245,13 +3218,12 @@
         "result_may_be_hidden_privacy_warning": "Adatvédelmi okokból néhány találat rejtve lehet",
         "result_may_be_hidden_warning": "Néhány találat rejtve lehet",
         "search_dialog": "Keresési párbeszédablak",
-        "search_messages_hint": "Az üzenetek kereséséhez keresse ezt az ikont a szoba tetején: <icon/>",
         "spaces_title": "Terek, amelynek tagja",
         "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",
@@ -3286,16 +3258,14 @@
         "error_start_thread_existing_relation": "Nem lehet üzenetszálat indítani olyan eseményről ami már rendelkezik kapcsolattal",
         "mark_all_read": "Az összes megjelölése olvasottként",
         "my_threads": "Saját üzenetszálak",
-        "my_threads_description": "Minden üzenetszál megjelenítése, amelyben részt vesz",
+        "my_threads_description": "Összes olyan üzenetszál megjelenítése, amelyben részt vesz",
         "open_thread": "Üzenetszál megnyitása",
         "show_thread_filter": "Megjelenítés:"
     },
     "threads_activity_centre": {
-        "header": "Üzenetszál aktivitás",
+        "header": "Üzenetszál-tevékenységek",
         "no_rooms_with_threads_notifs": "Még nincsenek olyan szobái, amelyek üzenetszál értesítéseket tartalmaznak.",
-        "no_rooms_with_unread_threads": "Nincsenek még olvasatlan üzenetszálakkal rendelkező szobái.",
-        "release_announcement_description": "Az üzenetszálak értesítései átkerültek, mostantól itt találja őket.",
-        "release_announcement_header": "Üzenetszál Tevékenységi Központ"
+        "no_rooms_with_unread_threads": "Nincsenek még olvasatlan üzenetszálakkal rendelkező szobái."
     },
     "time": {
         "about_day_ago": "egy napja",
@@ -3548,7 +3518,8 @@
         },
         "m.sticker": "%(senderDisplayName)s matricát küldött.",
         "m.video": {
-            "error_decrypting": "Hiba a videó visszafejtésénél"
+            "error_decrypting": "Hiba a videó visszafejtésénél",
+            "show_video": "Videó megjelenítése"
         },
         "m.widget": {
             "added": "%(senderName)s hozzáadta a %(widgetName)s kisalkalmazást",
@@ -3802,10 +3773,11 @@
         "unavailable": "Elérhetetlen"
     },
     "update_room_access_modal": {
-        "description": "Megosztási hivatkozás létrehozásához engedélyeznie kell a vendégek számára, hogy csatlakozzanak ehhez a szobához. Ez kevésbé biztonságossá teheti a szobát. Ha befejezte a hívást, ismét priváttá teheti a szobát.",
-        "dont_change_description": "Alternatív megoldásként a hívást külön szobában is tarthatja.",
+        "description": "Megosztási hivatkozás létrehozásához tegye <b>nyilvánossá</b> ezt a szobát, vagy engedélyezze azt a lehetőséget, hogy a felhasználók csatlakozást <b>kérhessenek</b>. Ez lehetővé teszi a vendégek számára, hogy meghívás nélkül csatlakozzanak.",
+        "dont_change_description": "Ha nem szeretné módosítani a szoba hozzáférését, létrehozhat egy új szobát a híváshoz.",
         "no_change": "Nem akarom megváltoztatni a hozzáférési szintet.",
-        "title": "A szoba hozzáférési szintjének módosítása"
+        "revert_access_description": "(Ez visszaállítható az előző értékre a Szoba beállításaiban: <b>Biztonság és adatvédelem </b> / <b>Hozzáférés</b>)",
+        "title": "Vendégfelhasználók csatlakozásának engedélyezése ehhez a szobához"
     },
     "upload_failed_generic": "A(z) „%(fileName)s” fájl feltöltése sikertelen.",
     "upload_failed_size": "A(z) „%(fileName)s” mérete túllépi a Matrix-kiszolgáló által megengedett korlátot",
@@ -4096,7 +4068,7 @@
         "error_need_to_be_logged_in": "Be kell jelentkeznie.",
         "error_unable_start_audio_stream_description": "A hangközvetítés indítása sikertelen.",
         "error_unable_start_audio_stream_title": "Az élő adás indítása sikertelen",
-        "modal_data_warning": "A lenti adatok megosztásra kerülnek ezzel: %(widgetDomain)s",
+        "modal_data_warning": "Az alábbi adatok a következővel vannak megosztva: %(widgetDomain)s",
         "modal_title_default": "Előugró kisalkalmazás",
         "no_name": "Ismeretlen alkalmazás",
         "open_id_permissions_dialog": {
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9e14060ce0..d42f86dab5 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -1,6 +1,8 @@
 {
     "a11y": {
+        "emoji_picker": "Pemilih emoji",
         "jump_first_invite": "Pergi ke undangan pertama.",
+        "message_composer": "Komposer pesan",
         "n_unread_messages": {
             "one": "1 pesan yang belum dibaca.",
             "other": "%(count)s pesan yang belum dibaca."
@@ -9,7 +11,18 @@
             "one": "1 sebutan yang belum dibaca.",
             "other": "%(count)s pesan yang belum dibaca termasuk sebutan."
         },
+        "recent_rooms": "Ruangan terkini",
+        "room_messsage_not_sent": "Buka ruangan %(roomName)s dengan pesan yang belum diatur.",
+        "room_n_unread_invite": "Buka undangan ruangan %(roomName)s.",
+        "room_n_unread_messages": {
+            "other": "Buka ruangan %(roomName)s dengan %(count)s pesan yang belum dibaca."
+        },
+        "room_n_unread_messages_mentions": {
+            "other": "Buka ruangan %(roomName)s dengan %(count)s pesan yang belum dibaca termasuk sebutan."
+        },
         "room_name": "Ruangan %(name)s",
+        "room_status_bar": "Bilah status ruangan",
+        "seek_bar_label": "Bilah pencarian audio",
         "unread_messages": "Pesan yang belum dibaca.",
         "user_menu": "Menu pengguna"
     },
@@ -40,6 +53,8 @@
         "create_a_room": "Buat sebuah ruangan",
         "create_account": "Buat Akun",
         "decline": "Tolak",
+        "decline_and_block": "Tolak dan blokir",
+        "decline_invite": "Tolak undangan",
         "delete": "Hapus",
         "deny": "Tolak",
         "disable": "Nonaktifkan",
@@ -59,6 +74,7 @@
         "go": "Mulai",
         "go_back": "Kembali ke sebelumnya",
         "got_it": "Mengerti",
+        "hide": "Sembunyikan",
         "hide_advanced": "Sembunyikan lanjutan",
         "hold": "Jeda",
         "ignore": "Abaikan",
@@ -75,12 +91,14 @@
         "maximise": "Maksimalkan",
         "mention": "Sebutkan",
         "minimise": "Minimalkan",
+        "new_message": "Pesan baru",
         "new_room": "Ruangan baru",
         "new_video_room": "Ruangan video baru",
         "next": "Lanjut",
         "no": "Tidak",
         "ok": "Oke",
         "open": "Buka",
+        "open_menu": "Buka menu",
         "pause": "Jeda",
         "pin": "Sematkan",
         "play": "Mainkan",
@@ -89,13 +107,13 @@
         "react": "Bereaksi",
         "refresh": "Muat Ulang",
         "register": "Daftar",
-        "reject": "Tolak",
         "reload": "Muat ulang",
         "remove": "Hapus",
         "rename": "Ubah Nama",
         "reply": "Balas",
         "reply_in_thread": "Balas di utasan",
         "report_content": "Laporkan Konten",
+        "report_room": "Laporkan ruangan",
         "resend": "Kirim Ulang",
         "reset": "Atur Ulang",
         "resume": "Lanjutkan",
@@ -105,6 +123,7 @@
         "save": "Simpan",
         "search": "Cari",
         "send_report": "Kirimkan laporan",
+        "set_avatar": "Atur foto profil",
         "share": "Bagikan",
         "show": "Tampilkan",
         "show_advanced": "Tampilkan lanjutan",
@@ -128,6 +147,7 @@
         "update": "Perbarui",
         "upgrade": "Tingkatkan",
         "upload": "Unggah",
+        "upload_file": "Unggah berkas",
         "verify": "Lakukan verifikasi",
         "view": "Pratinjau",
         "view_all": "Tampilkan semua",
@@ -135,6 +155,7 @@
         "view_message": "Tampilkan pesan",
         "view_source": "Tampilkan Sumber",
         "yes": "Ya",
+        "yes_dismiss": "Ya, abaikan",
         "zoom_in": "Perbesar",
         "zoom_out": "Perkecil"
     },
@@ -222,6 +243,7 @@
         },
         "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",
+        "mobile_create_account_title": "Anda akan membuat akun di %(hsName)s",
         "msisdn_field_description": "Pengguna lain dapat mengundang Anda ke ruangan menggunakan detail kontak Anda",
         "msisdn_field_label": "Ponsel",
         "msisdn_field_number_invalid": "Nomor teleponnya tidak terlihat benar, mohon periksa dan coba lagi",
@@ -229,6 +251,7 @@
         "no_hs_url_provided": "Tidak ada URL homeserver yang disediakan",
         "oidc": {
             "error_title": "Kami tidak dapat memasukkan Anda",
+            "generic_auth_error": "Terjadi kesalahan saat autentikasi. Buka laman masuk dan coba lagi.",
             "missing_or_invalid_stored_state": "Kami menanyakan browser ini untuk mengingat homeserver apa yang Anda gunakan untuk membantu Anda masuk, tetapi sayangnya browser ini melupakannya. Pergi ke halaman masuk dan coba lagi."
         },
         "password_field_keep_going_prompt": "Lanjutkan…",
@@ -238,11 +261,40 @@
         "phone_label": "Ponsel",
         "phone_optional_label": "Nomor telepon (opsional)",
         "qr_code_login": {
+            "check_code_explainer": "Ini akan memverifikasi bahwa koneksi ke perangkat Anda yang lain aman.",
+            "check_code_heading": "Masukkan nomor yang ditampilkan di perangkat Anda yang lain",
+            "check_code_input_label": "Kode 2 digit",
+            "check_code_mismatch": "Angkanya tidak cocok",
             "completing_setup": "Menyelesaikan penyiapan perangkat baru Anda",
-            "error_unexpected": "Sebuah kesalahan terjadi secara tidak terduga.",
-            "scan_code_instruction": "Pindai kode QR di bawah dengan perangkat Anda yang sudah keluar dari akun.",
-            "scan_qr_code": "Pindai kode QR",
-            "select_qr_code": "Pilih '%(scanQRCode)s'",
+            "error_etag_missing": "Terjadi kesalahan yang tidak terduga. Hal ini mungkin disebabkan oleh pengaya peramban, server proksi atau kesalahan konfigurasi server.",
+            "error_expired": "Masa masuk sudah habis. Silakan coba lagi.",
+            "error_expired_title": "Proses masuk tidak selesai tepat waktu",
+            "error_insecure_channel_detected": "Koneksi aman tidak dapat dibuat ke perangkat baru. Perangkat Anda yang ada masih aman dan Anda tidak perlu khawatir tentang mereka.",
+            "error_insecure_channel_detected_instructions": "Sekarang apa?",
+            "error_insecure_channel_detected_instructions_1": "Coba masuk ke perangkat lain lagi dengan kode QR jika ini adalah masalah jaringan",
+            "error_insecure_channel_detected_instructions_2": "Jika Anda mengalami masalah yang sama, coba jaringan Wi-Fi yang berbeda atau gunakan data seluler Anda daripada Wi-Fi",
+            "error_insecure_channel_detected_instructions_3": "Jika tidak berhasil, masuk secara manual",
+            "error_insecure_channel_detected_title": "Koneksi tidak aman",
+            "error_other_device_already_signed_in": "Anda tidak perlu melakukan hal lain.",
+            "error_other_device_already_signed_in_title": "Perangkat Anda yang lain sudah masuk",
+            "error_rate_limited": "Terlalu banyak percobaan dalam waktu yang singkat. Tunggu beberapa waktu sebelum mencoba lagi.",
+            "error_unexpected": "Terjadi kesalahan yang tidak terduga. Permintaan untuk menghubungkan perangkat Anda yang lain telah dibatalkan.",
+            "error_unsupported_protocol": "Perangkat ini tidak mendukung masuk ke perangkat lain dengan kode QR.",
+            "error_unsupported_protocol_title": "Perangkat lain tidak kompatibel",
+            "error_user_cancelled": "Proses masuk dibatalkan di perangkat lain.",
+            "error_user_cancelled_title": "Permintaan masuk dibatalkan",
+            "error_user_declined": "Anda menolak permintaan dari perangkat Anda yang lain untuk masuk.",
+            "error_user_declined_title": "Masuk ditolak",
+            "follow_remaining_instructions": "Ikuti petunjuk selanjutnya untuk memverifikasi perangkat Anda yang lain",
+            "open_element_other_device": "Buka %(brand)s di perangkat Anda yang lain",
+            "point_the_camera": "Arahkan kamera ke kode QR yang ditampilkan di sini",
+            "scan_code_instruction": "Pindai kode QR dengan perangkat lain",
+            "scan_qr_code": "Masuk dengan kode QR",
+            "security_code": "Kode keamanan",
+            "security_code_prompt": "Jika diminta, masukkan kode di bawah ini pada perangkat Anda yang lain.",
+            "select_qr_code": "Pilih \"%(scanQRCode)s\"",
+            "unsupported_explainer": "Penyedia akun Anda tidak mendukung masuk ke perangkat baru dengan kode QR.",
+            "unsupported_heading": "Kode QR tidak didukung",
             "waiting_for_device": "Menunggu perangkat untuk masuk"
         },
         "register_action": "Buat Akun",
@@ -331,6 +383,9 @@
             "email_resend_prompt": "Belum menerima? <a>Kirim ulang</a>",
             "email_resent": "Dikirimkan ulang!",
             "fallback_button": "Mulai autentikasi",
+            "mas_cross_signing_reset_cta": "Buka akun Anda",
+            "mas_cross_signing_reset_description": "Atur ulang identitas Anda melalui penyedia akun Anda, kemudian kembali dan klik “Coba lagi”.",
+            "mas_cross_signing_reset_title": "Buka akun Anda untuk mengatur ulang identitas Anda",
             "msisdn": "Sebuah pesan teks telah dikirim ke %(msisdn)s",
             "msisdn_token_incorrect": "Token salah",
             "msisdn_token_prompt": "Silakan masukkan kode yang berisi:",
@@ -365,6 +420,15 @@
         "download_logs": "Unduh catatan",
         "downloading_logs": "Mengunduh catatan",
         "error_empty": "Mohon beri tahu kami apa saja yang salah atau, lebih baik, buat sebuah issue GitHub yang menjelaskan masalahnya.",
+        "failed_download_logs": "Gagal mengunduh log pengawakutuan: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Laporan pengawakutuan Anda ditolak. Server rageshake tidak mendukung aplikasi ini.",
+            "rejected_generic": "Laporan bug Anda ditolak. Server rageshake menolak isi laporan karena suatu kebijakan.",
+            "rejected_recovery_key": "Laporan pengawakutuan Anda ditolak karena alasan keamanan, karena berisi kunci pemulihan.",
+            "rejected_version": "Laporan pengawakutuan Anda ditolak karena versi yang Anda jalankan terlalu lawas.",
+            "server_unknown_error": "Server rageshake mengalami kesalahan yang tidak diketahui dan tidak dapat menangani laporan.",
+            "unknown_error": "Gagal mengirim log."
+        },
         "github_issue": "Masalah GitHub",
         "introduction": "Jika Anda mengirim sebuah kutu via GitHub, catatan pengawakutu dapat membantu kami melacak masalahnya. ",
         "log_request": "Untuk membantu kami mencegahnya di masa mendatang, silakan <a>kirimkan kami catatan</a>.",
@@ -404,6 +468,7 @@
         "access_token": "Token Akses",
         "accessibility": "Aksesibilitas",
         "advanced": "Tingkat Lanjut",
+        "all_chats": "Semua Obrolan",
         "analytics": "Analitik",
         "and_n_others": {
             "one": "dan satu lainnya...",
@@ -418,10 +483,10 @@
         "beta": "Beta",
         "camera": "Kamera",
         "cameras": "Kamera",
+        "cancel": "Batalkan",
         "capabilities": "Kemampuan",
         "copied": "Disalin!",
         "credits": "Kredit",
-        "cross_signing": "Penandatanganan silang",
         "dark": "Gelap",
         "description": "Deskripsi",
         "deselect_all": "Batalkan semua pilihan",
@@ -457,8 +522,10 @@
         "matrix": "Matrix",
         "message": "Pesan",
         "message_layout": "Tata letak pesan",
+        "message_timestamp_invalid": "Stempel waktu tidak valid",
         "microphone": "Mikrofon",
         "model": "Model",
+        "moderation_and_safety": "Moderasi dan keamanan",
         "modern": "Modern",
         "mute": "Bisukan",
         "n_members": {
@@ -494,10 +561,13 @@
         "qr_code": "Kode QR",
         "random": "Sembarangan",
         "reactions": "Reaksi",
+        "recommended": "Disarankan",
         "report_a_bug": "Laporkan sebuah bug",
         "room": "Ruangan",
         "room_name": "Nama ruangan",
         "rooms": "Ruangan",
+        "save": "Simpan",
+        "saved": "Disimpan",
         "saving": "Menyimpan…",
         "secure_backup": "Cadangan Aman",
         "select_all": "Pilih semua",
@@ -524,6 +594,7 @@
         "unnamed_room": "Ruangan Tanpa Nama",
         "unnamed_space": "Space Tidak Dinamai",
         "unverified": "Belum diverifikasi",
+        "updating": "Memperbarui...",
         "user": "Pengguna",
         "user_avatar": "Gambar profil",
         "username": "Nama Pengguna",
@@ -579,6 +650,7 @@
         "placeholder_reply_encrypted": "Kirim sebuah balasan terenkripsi…",
         "placeholder_thread": "Balas ke utasan…",
         "placeholder_thread_encrypted": "Balas ke utasan yang terenkripsi…",
+        "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",
@@ -651,6 +723,7 @@
         "private_space_description": "Sebuah space pribadi untuk Anda dan tim Anda",
         "public_description": "Space terbuka untuk siapa saja, baik untuk komunitas",
         "public_heading": "Space publik Anda",
+        "search_public_button": "Cari ruangan publik",
         "setup_rooms_community_description": "Mari kita buat ruangan untuk masing-masing.",
         "setup_rooms_community_heading": "Apa saja yang Anda ingin bahas di %(spaceName)s?",
         "setup_rooms_description": "Anda juga dapat menambahkan lebih banyak nanti, termasuk yang sudah ada.",
@@ -674,12 +747,58 @@
         "twemoji": "Gambar emoji <twemoji>Twemoji</twemoji> © <author>Twitter, Inc dan kontributor lainnya</author> digunakan di bawah ketentuan <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Fon <colr>twemoji-colr</colr> © <author>Mozilla Foundation</author> digunakan di bawah ketentuan <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Apakah Anda yakin ingin menolak undangan untuk bergabung dengan \"%(roomName)s\"?",
+        "ignore_user_help": "Anda tidak akan melihat pesan atau undangan ruangan dari pengguna ini.",
+        "reason_description": "Jelaskan alasan untuk melaporkan ruangan.",
+        "report_room_description": "Laporkan ruangan ini ke penyedia akun Anda.",
+        "title": "Tolak undangan"
+    },
+    "desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
     "devtools": {
         "active_widgets": "Widget Aktif",
         "category_other": "Lainnya",
         "category_room": "Ruangan",
         "caution_colon": "Peringatan:",
         "client_versions": "Versi Klien",
+        "crypto": {
+            "4s_public_key_in_account_data": "dalam data akun",
+            "4s_public_key_not_in_account_data": "tidak ditemukan",
+            "4s_public_key_status": "Kunci publik penyimpanan rahasia:",
+            "backup_key_cached": "dalam tembolok secara lokal",
+            "backup_key_cached_status": "Kunci cadangan dalam tembolok:",
+            "backup_key_not_stored": "tidak disimpan",
+            "backup_key_stored": "dalam penyimpanan rahasia",
+            "backup_key_stored_status": "Kunci cadangan disimpan:",
+            "backup_key_unexpected_type": "jenis tidak terduga",
+            "backup_key_well_formed": "terbentuk dengan baik",
+            "cross_signing": "Penandatanganan silang",
+            "cross_signing_cached": "dalam tembolok secara lokal",
+            "cross_signing_not_ready": "Penandatanganan silang belum disiapkan.",
+            "cross_signing_private_keys_in_storage": "dalam penyimpanan rahasia",
+            "cross_signing_private_keys_in_storage_status": "Kunci pribadi penandatanganan silang:",
+            "cross_signing_private_keys_not_in_storage": "tidak ditemukan dalam penyimpanan",
+            "cross_signing_public_keys_on_device": "dalam memori",
+            "cross_signing_public_keys_on_device_status": "Kunci publik penandatanganan silang:",
+            "cross_signing_ready": "Penandatanganan silang siap digunakan.",
+            "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",
+            "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.",
+            "key_backup_latest_version": "Versi cadangan terbaru di server:",
+            "key_storage": "Penyimpanan Kunci",
+            "master_private_key_cached_status": "Kunci pribadi utama:",
+            "not_found": "tidak ditemukan",
+            "not_found_locally": "tidak ditemukan secara lokal",
+            "secret_storage_not_ready": "belum siap",
+            "secret_storage_ready": "siap",
+            "secret_storage_status": "Penyimpanan rahasia:",
+            "self_signing_private_key_cached_status": "Kunci pribadi penandatanganan sendiri:",
+            "title": "Enkripsi ujung ke ujung",
+            "user_signing_private_key_cached_status": "Kunci pribadi penandatanganan pengguna:"
+        },
         "developer_mode": "Mode pengembang",
         "developer_tools": "Alat Pengembang",
         "edit_setting": "Edit pengaturan",
@@ -734,6 +853,9 @@
         "setting_colon": "Pengaturan:",
         "setting_definition": "Definisi pengaturan:",
         "setting_id": "ID Pengaturan",
+        "settings": {
+            "elementCallUrl": "URL Element Call"
+        },
         "settings_explorer": "Penelusur pengaturan",
         "show_hidden_events": "Tampilkan peristiwa tersembunyi di lini masa",
         "spaces": {
@@ -786,52 +908,37 @@
     "empty_room_was_name": "Ruangan kosong (sebelumnya %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Masukkan Frasa Keamanan Anda atau <button>gunakan Kunci Keamanan Anda</button> untuk melanjutkan.",
+            "alternatives": "Jika Anda memiliki kunci keamanan atau frasa keamanan, ini juga bisa digunakan.",
             "key_validation_text": {
-                "invalid_security_key": "Kunci Keamanan tidak absah",
-                "recovery_key_is_correct": "Kelihatannya bagus!",
-                "wrong_file_type": "Tipe file salah",
-                "wrong_security_key": "Kunci Keamanan salah"
+                "wrong_security_key": "Kunci pemulihan yang Anda masukkan salah."
             },
-            "reset_title": "Atur ulang semuanya",
-            "reset_warning_1": "Hanya lakukan ini jika Anda tidak memiliki perangkat yang lain untuk menyelesaikan verifikasi.",
-            "reset_warning_2": "Jika Anda mengatur ulang semuanya, Anda dengan mulai ulang dengan tidak ada sesi yang dipercayai, tidak ada pengguna yang dipercayai, dan mungkin tidak dapat melihat pesan-pesan lama.",
+            "privacy_warning": "Pastikan tidak ada yang bisa melihat layar ini!",
             "restoring": "Memulihkan kunci-kunci dari cadangan",
-            "security_key_title": "Kunci Keamanan",
-            "security_phrase_incorrect_error": "Tidak dapat mengakses penyimpanan rahasia. Periksa jika Anda memasukkan Frasa Keamanan yang benar.",
-            "security_phrase_title": "Frasa Keamanan",
-            "separator": "%(securityKey)s atau %(recoveryFile)s",
-            "use_security_key_prompt": "Gunakan Kunci Keamanan Anda untuk melanjutkan."
+            "security_key_title": "Kunci pemulihan"
         },
         "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_not_ready": "Penandatanganan silang belum disiapkan.",
-        "cross_signing_ready": "Penandatanganan silang siap digunakan.",
-        "cross_signing_ready_no_backup": "Penandatanganan silang telah siap tetapi kunci belum dicadangkan.",
         "cross_signing_room_normal": "Ruangan ini dienkripsi secara ujung ke ujung",
         "cross_signing_room_verified": "Semuanya di ruangan ini telah terverifikasi",
         "cross_signing_room_warning": "Seseorang menggunakan sesi yang tidak dikenal",
-        "cross_signing_unsupported": "Homeserver Anda tidak mendukung penandatanganan silang.",
-        "cross_signing_untrusted": "Akun Anda mempunyai identitas penandatanganan silang di penyimpanan rahasia, tetapi belum dipercayai oleh sesi ini.",
         "cross_signing_user_normal": "Anda belum memverifikasi pengguna ini.",
         "cross_signing_user_verified": "Anda telah memverifikasi pengguna ini. Pengguna ini telah memverifikasi semua sesinya.",
         "cross_signing_user_warning": "Pengguna ini belum memverifikasi semua sesinya.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Hapus kunci-kunci penandatanganan silang",
-            "title": "Hancurkan kunci-kunci penandatanganan silang?",
-            "warning": "Menghapus kunci penandatanganan silang itu permanen. Siapa saja yang Anda verifikasi akan melihat peringatan keamanan. Anda hampir pasti tidak ingin melakukan ini, kecuali jika Anda kehilangan setiap perangkat yang dapat digunakan untuk melakukan penandatanganan silang."
-        },
+        "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_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.",
         "event_shield_reason_unverified_identity": "Dienkripsi oleh pengguna yang tidak diverifikasi.",
         "export_unsupported": "Browser Anda tidak mendukung ekstensi kriptografi yang dibutuhkan",
+        "forgot_recovery_key": "Lupa kunci pemulihan?",
         "import_invalid_keyfile": "Bukan keyfile %(brand)s yang absah",
         "import_invalid_passphrase": "Pemeriksaan autentikasi gagal: kata sandi salah?",
+        "key_storage_out_of_sync": "Penyimpanan kunci Anda tidak tersinkron.",
+        "key_storage_out_of_sync_description": "Konfirmasikan kunci pemulihan Anda untuk mempertahankan akses ke penyimpanan kunci dan riwayat pesan Anda.",
         "messages_not_secure": {
             "cause_1": "Homeserver Anda",
             "cause_2": "Homeserver pengguna yang Anda memverifikasi",
@@ -846,7 +953,8 @@
             "title": "Metode Pemulihan Baru",
             "warning": "Jika Anda tidak menyetel metode pemulihan yang baru, sebuah penyerang mungkin mencoba mengakses akun Anda. Ubah kata sandi akun Anda dan segera tetapkan metode pemulihan yang baru di Pengaturan."
         },
-        "not_supported": "<tidak didukung>",
+        "pinned_identity_changed": "Identitas (<b>%(userId)s</b>) %(displayName)s tampaknya telah berubah. <a>Pelajari lebih lanjut</a>",
+        "pinned_identity_changed_no_displayname": "Identitas <b>%(userId)s</b> tampaknya telah berubah. <a>Pelajari lebih lanjut</a>",
         "recovery_method_removed": {
             "description_1": "Sesi ini telah mendeteksi bahwa Frasa Keamanan dan kunci untuk Pesan Aman Anda telah dihapus.",
             "description_2": "Jika Anda melakukan ini secara tidak sengaja, Anda dapat mengatur Pesan Aman pada sesi ini yang akan mengenkripsi ulang riwayat pesan sesi ini dengan metode pemulihan baru.",
@@ -854,12 +962,16 @@
             "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.",
-            "title": "Siapkan"
+            "explainer": "Cadangkan kunci Anda sebelum keluar untuk menghindari kehilangannya."
         },
+        "turn_on_key_storage": "Aktifkan penyimpanan kunci",
+        "turn_on_key_storage_description": "Simpan identitas kriptografi dan kunci pesan Anda secara aman di server. Ini akan memungkinkan Anda untuk melihat riwayat pesan Anda di perangkat baru mana pun.",
         "udd": {
             "interactive_verification_button": "Verifikasi secara interaktif sengan emoji",
             "other_ask_verify_text": "Tanyakan pengguna ini untuk memverifikasi sesinya, atau verifikasi secara manual di bawah.",
@@ -873,7 +985,6 @@
             "accepting": "Menerima…",
             "after_new_login": {
                 "device_verified": "Perangkat telah diverifikasi",
-                "reset_confirmation": "Benar-benar ingin mengatur ulang kunci-kunci verifikasi?",
                 "skip_verification": "Lewatkan verifikasi untuk sementara",
                 "unable_to_verify": "Tidak dapat memverifikasi perangkat ini",
                 "verify_this_device": "Verifikasi perangkat ini"
@@ -895,7 +1006,7 @@
             "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 Keamanan atau perangkat lainnya yang Anda dapat gunakan untuk memverifikasi.  Perangkat ini tidak dapat mengakses ke pesan terenkripsi lama. Untuk membuktikan identitas Anda, kunci verifikasi harus diatur ulang.",
+            "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.",
             "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.",
             "other_party_cancelled": "Pengguna yang lain membatalkan proses verifikasi ini.",
             "prompt_encrypted": "Verifikasi semua pengguna di sebuah ruangan untuk memastikan keamanannya.",
@@ -908,6 +1019,7 @@
             "qr_reciprocate_same_shield_device": "Hampir selesai! Apakah perangkat lain Anda menampilkan perisai yang sama?",
             "qr_reciprocate_same_shield_user": "Hampir selesai! Apakah %(displayName)s menampilkan perisai yang sama?",
             "request_toast_accept": "Verifikasi Sesi",
+            "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",
@@ -933,7 +1045,7 @@
             "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-pesan terenkripsi Anda dan buktikan identitas Anda kepada lainnya.",
+            "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.",
             "verification_dialog_title_device": "Verifikasi perangkat lain",
             "verification_dialog_title_user": "Permintaan Verifikasi",
             "verification_skip_warning": "Tanpa memverifikasi, Anda tidak akan memiliki akses ke semua pesan Anda dan tampak tidak dipercayai kepada lainnya.",
@@ -943,19 +1055,20 @@
             "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_reset_warning_1": "Mengatur ulang kunci verifikasi Anda tidak dapat dibatalkan. Setelah mengatur ulang, Anda tidak akan memiliki akses ke pesan terenkripsi lama, dan semua orang yang sebelumnya telah memverifikasi Anda akan melihat peringatan keamanan sampai Anda memverifikasi ulang dengan mereka.",
-            "verify_reset_warning_2": "Hanya lanjutkan jika Anda yakin Anda telah kehilangan semua perangkat lainnya dan kunci keamanan Anda.",
             "verify_using_device": "Verifikasi dengan perangkat lain",
             "verify_using_key": "Verifikasi dengan Kunci Keamanan",
-            "verify_using_key_or_phrase": "Verifikasi dengan Kunci Keamanan atau Frasa",
+            "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)…",
             "waiting_other_user": "Menunggu %(displayName)s untuk memverifikasi…"
         },
         "verification_requested_toast_title": "Verifikasi diminta",
+        "verified_identity_changed": "Identitas terverifikasi %(displayName)s (<b>%(userId)s</b>) telah berubah. <a>Pelajari lebih lanjut</a>",
+        "verified_identity_changed_no_displayname": "Identitas terverifikasi <b>%(userId)s</b> telah berubah. <a>Pelajari lebih lanjut</a>",
         "verify_toast_description": "Pengguna yang lain mungkin tidak mempercayainya",
-        "verify_toast_title": "Verifikasi sesi ini"
+        "verify_toast_title": "Verifikasi sesi ini",
+        "withdraw_verification_action": "Tolak verifikasi"
     },
     "error": {
         "admin_contact": "Mohon <a>hubungi administrator layanan Anda</a> untuk melanjutkan menggunakan layanannya.",
@@ -996,6 +1109,13 @@
         "unknown_error_code": "kode kesalahan tidak diketahui",
         "update_power_level": "Gagal untuk mengubah tingkat daya"
     },
+    "error_app_open_in_another_tab": "%(brand)s telah dibuka di tab lain.",
+    "error_app_open_in_another_tab_title": "%(brand)s sedang terhubung di tab lain",
+    "error_app_opened_in_another_window": "%(brand)s sedang dibuka di jendela lain. Klik \"%(label)s\" untuk menggunakan %(brand)s di sini dan putuskan sambungan di jendela lainnya.",
+    "error_database_closed_description": {
+        "for_desktop": "Diska Anda mungkin sudah penuh. Mohon bersihkan beberapa ruang dan muat ulang.",
+        "for_web": "Jika Anda menghapus data penelusuran, maka pesan ini akan muncul. %(brand)s mungkin juga terbuka di tab lain, atau diska Anda penuh. Tolong bersihkan beberapa ruang dan muat ulang"
+    },
     "error_database_closed_title": "%(brand)s berhenti bekerja",
     "error_dialog": {
         "copy_room_link_failed": {
@@ -1003,11 +1123,7 @@
             "title": "Tidak dapat menyalin tautan ruangan"
         },
         "error_loading_user_profile": "Tidak dapat memuat profil pengguna",
-        "forget_room_failed": "Gagal melupakan ruangan %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Server mungkin tidak tersedia, terlalu penuh, atau waktu pencarian habis :(",
-            "title": "Pencarian gagal"
-        }
+        "forget_room_failed": "Gagal melupakan ruangan %(errCode)s"
     },
     "error_user_not_logged_in": "Pengguna belum masuk",
     "event_preview": {
@@ -1032,7 +1148,15 @@
             "you": "Anda bereaksi %(reaction)s ke %(message)s"
         },
         "m.sticker": "%(senderName)s: %(stickerName)s",
-        "m.text": "%(senderName)s: %(message)s"
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "Audio",
+            "file": "Berkas",
+            "image": "Gambar",
+            "poll": "Pemugutan suara",
+            "video": "Video"
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
     },
     "export_chat": {
         "cancelled": "Ekspor Dibatalkan",
@@ -1124,6 +1248,7 @@
         "change": "Ubah server identitas",
         "change_prompt": "Putuskan hubungan dari server identitas <current /> dan hubungkan ke <new />?",
         "change_server_prompt": "Jika Anda tidak ingin menggunakan <server /> untuk menemukan dan dapat ditemukan oleh kontak yang Anda tahu, masukkan server identitas yang lain di bawah.",
+        "changed": "Server identitas Anda telah diubah",
         "checking": "Memeriksa server",
         "description_connected": "Anda saat ini menggunakan <server></server> untuk menemukan dan dapat ditemukan oleh kontak yang Anda tahu. Anda dapat mengubah server identitas di bawah.",
         "description_disconnected": "Anda saat ini tidak menggunakan sebuah server identitas. Untuk menemukan dan dapat ditemukan oleh kontak yang Anda tahu, tambahkan satu di bawah.",
@@ -1155,7 +1280,20 @@
         "other": "Dalam %(spaceName)s dan %(count)s space lainnya."
     },
     "incompatible_browser": {
-        "title": "Peramban tidak didukung"
+        "continue": "Tetap lanjutkan",
+        "description": "%(brand)s menggunakan beberapa fitur peramban yang tidak tersedia di peramban Anda saat ini. %(detail)s",
+        "detail_can_continue": "Jika Anda melanjutkan, beberapa fitur mungkin berhenti bekerja dan ada risiko kehilangan data di masa mendatang.",
+        "detail_no_continue": "Coba perbarui peramban ini jika Anda tidak menggunakan versi terbaru dan coba lagi.",
+        "learn_more": "Pelajari lebih lanjut",
+        "linux": "Linux",
+        "macos": "Mac",
+        "supported_browsers": "Untuk pengalaman terbaik, gunakan <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge>, atau <Safari>Safari</Safari>.",
+        "title": "Peramban tidak didukung",
+        "use_desktop_heading": "Gunakan %(brand)s Desktop sebagai gantinya",
+        "use_mobile_heading": "Gunakan %(brand)s di ponsel sebagai gantinya",
+        "use_mobile_heading_after_desktop": "Atau gunakan aplikasi ponsel kami",
+        "windows_64bit": "Windows (64-bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
     },
     "info_tooltip_title": "Informasi",
     "integration_manager": {
@@ -1164,6 +1302,7 @@
         "error_connecting_heading": "Tidak dapat menghubungkan ke manajer integrasi",
         "explainer": "Manajer integrasi menerima data pengaturan, dan dapat mengubah widget, mengirimkan undangan ruangan, dan mengatur tingkat daya dengan sepengetahuan Anda.",
         "manage_title": "Kelola integrasi",
+        "toggle_label": "Aktifkan pengelola integrasi",
         "use_im": "Gunakan sebuah manajer integrasi untuk mengelola bot, widget, dan paket stiker.",
         "use_im_default": "Gunakan manajer integrasi <b>(%(serverName)s)</b> untuk mengelola bot, widget, dan paket stiker."
     },
@@ -1195,6 +1334,8 @@
         "error_permissions_space": "Anda tidak memiliki izin untuk mengundang seseorang ke space ini.",
         "error_profile_undisclosed": "Pengguna mungkin atau mungkin tidak ada",
         "error_transfer_multiple_target": "Sebuah panggilan dapat dipindah ke sebuah pengguna.",
+        "error_unfederated_room": "Ruangan ini tidak terfederasi. Anda tidak dapat mengundang orang dari server eksternal.",
+        "error_unfederated_space": "Space ini tidak terfederasi. Anda tidak dapat mengundang orang dari server eksternal.",
         "error_unknown": "Kesalahan server yang tidak diketahui",
         "error_user_not_found": "Pengguna tidak ada",
         "error_version_unsupported_room": "Homeserver penggunanya tidak mendukung versi ruangannya.",
@@ -1277,12 +1418,14 @@
         "navigate_next_message_edit": "Pergi ke pesan berikutnya untuk diedit",
         "navigate_prev_history": "Ruangan atau space yang dikunjungi sebelumnya",
         "navigate_prev_message_edit": "Pergi ke pesan sebelumnya untuk diedit",
+        "next_landmark": "Pergi ke tengara berikutnya",
         "next_room": "Ruangan atau pesan langsung berikutnya",
         "next_unread_room": "Ruangan atau pesan langsung berikutnya yang belum dibaca",
         "number": "[nomor]",
         "open_user_settings": "Buka pengaturan pengguna",
         "page_down": "Halaman Bawah",
         "page_up": "Halaman Atas",
+        "prev_landmark": "Pergi ke tengara sebelumnya",
         "prev_room": "Ruangan atau pesan langsung sebelumnya",
         "prev_unread_room": "Ruangan atau pesan langsung sebelumnya yang belum dibaca",
         "room_list_collapse_section": "Tutup bagian daftar ruangan",
@@ -1327,8 +1470,12 @@
         "dynamic_room_predecessors": "Pendahulu ruang dinamis",
         "dynamic_room_predecessors_description": "Aktifkan MSC3946 (untuk mendukung arsip ruangan yang datang terlambat)",
         "element_call_video_rooms": "Ruangan video Element Call",
+        "exclude_insecure_devices": "Kecualikan perangkat tidak aman ketika mengirim/menerima pesan",
+        "exclude_insecure_devices_description": "Jika mode ini diaktifkan, pesan terenkripsi tidak akan dibagikan dengan perangkat yang tidak terverifikasi, dan pesan dari perangkat yang tidak terverifikasi akan ditampilkan sebagai kesalahan. Perlu diperhatikan bahwa jika Anda mengaktifkan mode ini, Anda mungkin tidak dapat berkomunikasi dengan pengguna yang belum memverifikasi perangkat mereka.",
         "experimental_description": "Merasa eksperimental? Coba ide terkini kami dalam pengembangan. Fitur ini belum selesai; mereka mungkin tidak stabil, mungkin berubah, atau dihapus sama sekali. <a>Pelajari lebih lanjut</a>.",
         "experimental_section": "Pratinjau awal",
+        "extended_profiles_msc_support": "Memerlukan server Anda untuk mendukung MSC4133",
+        "feature_disable_call_per_sender_encryption": "Nonaktifkan enkripsi per pengirim untuk Element Call",
         "feature_wysiwyg_composer_description": "Menggunakan teks kaya daripada Markdown dalam komposer pesan.",
         "group_calls": "Pengalaman panggilan grup baru",
         "group_developer": "Pengembang",
@@ -1340,6 +1487,8 @@
         "group_rooms": "Ruangan",
         "group_spaces": "Space",
         "group_themes": "Tema",
+        "group_threads": "Utas",
+        "group_ui": "Antarmuka pengguna",
         "group_voip": "Suara & Video",
         "group_widgets": "Widget",
         "hidebold": "Sembunyikan titik notifikasi (hanya tampilkan lencana penghitung)",
@@ -1355,10 +1504,12 @@
         "location_share_live_description": "Penerapan sementara. Lokasi tetap berada di riwayat ruangan.",
         "mjolnir": "Cara baru mengabaikan orang",
         "msc3531_hide_messages_pending_moderation": "Memperbolehkan moderator untuk menyembunyikan pesan yang akan dimoderasikan.",
+        "new_room_list": "Aktifkan daftar ruangan baru",
         "notification_settings": "Pengaturan Notifikasi Baru",
         "notification_settings_beta_caption": "Perkenalkan cara yang lebih sederhana untuk mengubah pengaturan notifikasi Anda. Sesuaikan %(brand)s Anda, sesuai keinginan Anda.",
         "notification_settings_beta_title": "Pengaturan Notifikasi",
         "notifications": "Aktifkan panel notifikasi di tajuk ruangan",
+        "release_announcement": "Pengumuman rilis",
         "render_reaction_images": "Render gambar khusus dalam reaksi",
         "render_reaction_images_description": "Terkadang disebut sebagai \"emoji khusus\".",
         "report_to_moderators": "Laporkan ke moderator",
@@ -1366,7 +1517,7 @@
         "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",
-        "sliding_sync_server_no_support": "Server Anda belum mendukungnya",
+        "sliding_sync_server_no_support": "Server Anda tidak memiliki dukungan",
         "under_active_development": "Dalam pengembangan aktif.",
         "unrealiable_e2e": "Tidak dapat diandalkan di ruangan terenkripsi",
         "video_rooms": "Ruangan video",
@@ -1418,6 +1569,8 @@
         "last_person_warning": "Anda adalah satu-satunya di sini. Jika Anda keluar, tidak ada siapa saja dapat bergabung di masa mendatang, termasuk Anda.",
         "leave_room_question": "Anda yakin ingin meninggalkan ruangan '%(roomName)s'?",
         "leave_space_question": "Apakah Anda yakin untuk keluar dari space '%(spaceName)s'?",
+        "room_leave_admin_warning": "Anda adalah administrator satu-satunya di ruangan ini. Jika Anda keluar, tidak ada siapa pun yang dapat mengubah pengaturan ruangan atau melakukan tindakan penting lainnya.",
+        "room_leave_mod_warning": "Anda adalah moderator satu-satunya di ruangan ini. Jika Anda keluar, tidak ada siapa pun yang dapat mengubah pengaturan ruangan atau melakukan tindakan penting lainnya.",
         "room_rejoin_warning": "Ruangan ini tidak publik. Anda tidak dapat bergabung lagi tanpa sebuah undangan.",
         "space_rejoin_warning": "Space ini tidak publik. Anda tidak dapat bergabung lagi tanpa sebuah undangan."
     },
@@ -1475,12 +1628,18 @@
         "toggle_attribution": "Alih atribusi"
     },
     "member_list": {
+        "count": {
+            "other": "%(count)s Anggota"
+        },
         "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)"
     },
     "member_list_back_action_label": "Anggota ruangan",
     "message_edit_dialog_title": "Editan pesan",
+    "migrating_crypto": "Bersabarlah. Kami sedang memperbarui Element untuk membuat enkripsi lebih cepat dan andal.",
     "mobile_guide": {
         "toast_accept": "Gunakan aplikasi",
         "toast_description": "%(brand)s bersifat eksperimental pada peramban web ponsel. Untuk pengalaman yang lebih baik dan fitur-fitur terkini, gunakan aplikasi natif gratis kami.",
@@ -1498,6 +1657,7 @@
         "class_global": "Global",
         "class_other": "Lainnya",
         "default": "Bawaan",
+        "default_settings": "Cocokkan pengaturan bawaan",
         "email_pusher_app_display_name": "Notifikasi Surel",
         "enable_prompt_toast_description": "Aktifkan notifikasi desktop",
         "enable_prompt_toast_title": "Notifikasi",
@@ -1505,12 +1665,19 @@
         "error_change_title": "Ubah pengaturan notifikasi",
         "keyword": "Kata kunci",
         "keyword_new": "Kata kunci baru",
+        "level_activity": "Aktivitas",
+        "level_highlight": "Sorotan",
+        "level_muted": "Dibisukan",
+        "level_none": "Tidak ada",
+        "level_notification": "Notifikasi",
+        "level_unsent": "Pengiriman dibatalkan",
         "mark_all_read": "Tandai semua sebagai dibaca",
         "mentions_and_keywords": "@sebutan & kata kunci",
         "mentions_and_keywords_description": "Dapatkan notifikasi hanya dengan sebutan dan kata kunci yang diatur di <a>pengaturan</a> Anda",
-        "mentions_keywords": "Sebutan & kata kunci",
+        "mentions_keywords": "Sebutan dan kata kunci",
         "message_didnt_send": "Pesan tidak terkirim. Klik untuk informasi.",
-        "mute_description": "Anda tidak akan mendapatkan notifikasi apa pun"
+        "mute_description": "Anda tidak akan mendapatkan notifikasi apa pun",
+        "mute_room": "Bisukan ruangan"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s meminta verifikasi"
@@ -1591,7 +1758,8 @@
         "online": "Daring",
         "online_for": "Daring selama %(duration)s",
         "unknown": "Tidak Dikenal",
-        "unknown_for": "Tidak diketahui untuk %(duration)s"
+        "unknown_for": "Tidak diketahui untuk %(duration)s",
+        "unreachable": "Server pengguna tidak dapat dijangkau"
     },
     "quick_settings": {
         "all_settings": "Semua pengaturan",
@@ -1611,14 +1779,10 @@
         "ongoing": "Menghilangkan…",
         "reason_label": "Alasan (opsional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Anda yakin menolak undangannya?",
-        "failed": "Gagal menolak undangan",
-        "title": "Tolak undangan"
-    },
     "report_content": {
         "description": "Melaporkan pesan ini akan mengirimkan ID peristiwa yang untuk ke administrator homeserver Anda. Jika pesan-pesan di ruangan ini terenkripsi, maka administrator homeserver Anda tidak akan dapat membaca teks pesan atau menampilkan file atau gambar apa saja.",
         "disagree": "Tidak Setuju",
+        "error_create_room_moderation_bot": "Tidak dapat membuat ruangan dengan bot moderasi",
         "hide_messages_from_user": "Periksa jika Anda ingin menyembunyikan semua pesan saat ini dan pesan baru dari pengguna ini.",
         "ignore_user": "Abaikan pengguna",
         "illegal_content": "Konten Ilegal",
@@ -1626,6 +1790,8 @@
         "nature": "Harap pilih sifat dan jelaskan apa yang membuat pesan ini kasar.",
         "nature_disagreement": "Apa yang ditulis pengguna itu salah.\nIni akan dilaporkan ke moderator ruangan.",
         "nature_illegal": "Pengguna ini menampilkan kelakuan yang ilegal, misalnya dengan doxing orang lain atau ancaman kekerasan.\nIni akan dilaporkan ke moderator ruangan yang mungkin melaporkannya juga ke otoritas hukum.",
+        "nature_nonstandard_admin": "Ruang ini didedikasikan untuk konten ilegal atau toksik atau moderator gagal memoderasi konten ilegal atau toksik.\nHal ini akan dilaporkan kepada administrator %(homeserver)s.",
+        "nature_nonstandard_admin_encrypted": "Ruang ini didedikasikan untuk konten ilegal atau toksik atau moderator gagal memoderasi konten ilegal atau toksik.\nHal ini akan dilaporkan kepada administrator %(homeserver)s. Administrator TIDAK akan dapat membaca konten terenkripsi di ruangan ini.",
         "nature_other": "Alasan yang lain. Mohon jelaskan masalahnya.\nIni akan dilaporkan ke moderator ruangan.",
         "nature_spam": "Pengguna ini spam ruangan dengan iklan, tautan ke iklan atau ke propaganda.\nIni akan dilaporkan ke moderator ruangan.",
         "nature_toxic": "Pengguna ini menampilkan kelakuan yang toksik, misalnya dengan menghina pengguna lain atau membagikan konten dewasa di ruangan ramah keluarga atau merusak aturan ruangan.\nIni akan dilaporkan ke moderator ruangan.",
@@ -1635,6 +1801,10 @@
         "spam_or_propaganda": "Spam atau propaganda",
         "toxic_behaviour": "Kelakukan Toxic"
     },
+    "report_room": {
+        "description": "Laporkan ruangan ini ke admin homeserver Anda. Ini akan mengirimkan ID unik ruangan, tetapi jika pesan dienkripsi, administrator tidak akan dapat membacanya atau melihat file terbagi.",
+        "reason_label": "Jelaskan alasannya"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Gagal untuk mendekripsi %(failedCount)s sesi!",
         "count_of_successfully_restored_keys": "Berhasil memulihkan %(sessionCount)s kunci",
@@ -1647,26 +1817,48 @@
         "key_backup_warning": "<b>Peringatan</b>: Anda seharusnya menyiapkan cadangan kunci di komputer yang dipercayai.",
         "key_fetch_in_progress": "Mendapatkan kunci- dari server…",
         "key_forgotten_text": "Jika Anda lupa Kunci Keamanan, Anda dapat <button>menyiapkan opsi pemulihan baru</button>",
-        "key_is_invalid": "Bukan Kunci Keamanan yang absah",
-        "key_is_valid": "Ini sepertinya Kunci Keamanan yang absah!",
+        "key_is_invalid": "Bukan Kunci Pemulihan yang valid",
+        "key_is_valid": "Ini sepertinya Kunci Pemulihan yang valid!",
         "keys_restored_title": "Kunci-kunci terpulihkan",
         "load_error_content": "Tidak dapat memuat status cadangan",
         "load_keys_progress": "%(completed)s dari %(total)s kunci dipulihkan",
         "no_backup_error": "Tidak ada cadangan yang ditemukan!",
-        "phrase_forgotten_text": "Jika Anda lupa Frasa Keamanan, Anda dapat <button1>menggunakan Kunci Keamanan Anda</button1> atau <button2>siapkan opsi pemulihan baru</button2>",
-        "recovery_key_mismatch_description": "Cadangan tidak dapat didekripsikan dengan Kunci Keamanan ini: mohon periksa jika Anda memasukkan Kunci Keamanan yang benar.",
+        "phrase_forgotten_text": "Jika Anda lupa Frasa Keamanan Anda, Anda dapat <button1>menggunakan Kunci Pemulihan Anda</button1> atau <button2>mengatur opsi pemulihan baru</button2>",
+        "recovery_key_mismatch_description": "Cadangan tidak dapat didekripsi dengan Kunci Pemulihan ini: mohon pastikan Anda memasukkan Kunci Pemulihan yang benar.",
         "recovery_key_mismatch_title": "Kunci Keamanan tidak cocok",
         "restore_failed_error": "Tidak dapat memulihkan cadangan"
     },
     "right_panel": {
-        "add_integrations": "Tambahkan widget, jembatan & bot",
+        "add_integrations": "Tambahkan ekstensi",
+        "add_topic": "Tambahkan topik",
+        "extensions_button": "Ekstensi",
+        "extensions_empty_description": "Pilih “%(addIntegrations)s” untuk menelusuri dan menambahkan ekstensi ke ruangan ini",
+        "extensions_empty_title": "Tingkatkan produktivitas dengan lebih banyak alat, widget, dan bot",
         "files_button": "File",
         "pinned_messages": {
+            "empty_description": "Pilih pesan dan pilih “%(pinAction)s” untuk disertakan di sini.",
+            "empty_title": "Sematkan pesan penting agar mudah ditemukan",
+            "header": {
+                "other": "%(count)s Pesan tersemat"
+            },
             "limits": {
                 "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",
+                "content": "Pastikan Anda benar-benar ingin melepaskan sematan semua pesan tersemat. Tindakan ini tidak dapat diurungkan.",
+                "title": "Hapus sematan semua pesan?"
+            },
+            "view": "Lihat di lini masa"
         },
-        "pinned_messages_button": "Disematkan",
+        "pinned_messages_button": "Pesan yang disematkan",
         "poll": {
             "active_heading": "Pemungutan suara yang aktif",
             "empty_active": "Tidak ada pemungutan suara yang aktif di ruangan ini",
@@ -1691,7 +1883,7 @@
             "view_in_timeline": "Tampilkan pemungutan suara di lini masa",
             "view_poll": "Tampilkan pemungutan suara"
         },
-        "polls_button": "Riwayat pemungutan suara",
+        "polls_button": "Pemungutan suara",
         "room_summary_card": {
             "title": "Informasi ruangan"
         },
@@ -1720,6 +1912,7 @@
             "forget": "Lupakan Ruangan",
             "low_priority": "Prioritas Rendah",
             "mark_read": "Tandai sebagai dibaca",
+            "mark_unread": "Tandai sebagai belum dibaca",
             "notifications_default": "Sesuai dengan pengaturan bawaan",
             "notifications_mute": "Bisukan ruangan",
             "title": "Opsi ruangan",
@@ -1767,6 +1960,8 @@
             },
             "room_is_public": "Ruangan ini publik"
         },
+        "header_avatar_open_settings_label": "Buka pengaturan ruangan",
+        "header_face_pile_tooltip": "Alihkan daftar anggota",
         "header_untrusted_label": "Tidak dipercaya",
         "inaccessible": "Ruangan atau space ini tidak dapat diakses pada saat ini.",
         "inaccessible_name": "%(roomName)s tidak dapat diakses sekarang.",
@@ -1790,10 +1985,9 @@
             "you_created": "Anda membuat ruangan ini."
         },
         "invite_email_mismatch_suggestion": "Bagikan email ini di Pengaturan untuk mendapatkan undangan secara langsung di %(brand)s.",
-        "invite_reject_ignore": "Tolak & Abaikan pengguna",
         "invite_sent_to_email": "Undangan ini telah dikirim ke %(email)s",
         "invite_sent_to_email_room": "Undangan ke %(roomName)s ini terkirim ke %(email)s",
-        "invite_subtitle": "<userName/> mengundang Anda",
+        "invite_subtitle": "Diundang oleh <userName/>",
         "invite_this_room": "Undang ke ruangan ini",
         "invite_title": "Apakah Anda ingin bergabung %(roomName)s?",
         "inviter_unknown": "Tidak Dikenal",
@@ -1836,11 +2030,23 @@
         "not_found_title": "Ruangan atau space ini tidak ada.",
         "not_found_title_name": "%(roomName)s tidak ada.",
         "peek_join_prompt": "Anda melihat tampilan %(roomName)s. Ingin bergabung?",
+        "pinned_message_badge": "Pesan yang disematkan",
+        "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.",
+            "title": "<bold>%(index)s dari %(length)s</bold> Pesan yang disematkan"
+        },
         "read_topic": "Klik untuk membaca topik",
         "rejecting": "Menolak undangan…",
         "rejoin_button": "Bergabung Ulang",
         "search": {
             "all_rooms_button": "Cari semua ruangan",
+            "placeholder": "Cari pesan...",
+            "summary": {
+                "other": "%(count)s hasil ditemukan untuk “<query/>”"
+            },
             "this_room_button": "Cari ruangan ini"
         },
         "status_bar": {
@@ -1873,6 +2079,7 @@
             },
             "uploading_single_file": "Mengunggah %(filename)s"
         },
+        "video_room": "Ruangan ini adalah ruangan video",
         "waiting_for_join_subtitle": "Setelah pengguna yang diundang telah bergabung ke %(brand)s, Anda akan dapat bercakapan dan ruangan akan terenkripsi secara ujung ke ujung",
         "waiting_for_join_title": "Menunggu pengguna untuk bergabung ke %(brand)s"
     },
@@ -1881,29 +2088,79 @@
         "add_space_label": "Tambahkan space",
         "breadcrumbs_empty": "Tidak ada ruangan yang baru saja dilihat",
         "breadcrumbs_label": "Ruangan yang baru saja dilihat",
+        "empty": {
+            "no_chats": "Belum ada obrolan",
+            "no_chats_description": "Mulailah dengan mengirim pesan kepada seseorang atau dengan membuat ruangan",
+            "no_chats_description_no_room_rights": "Mulailah dengan mengirim pesan kepada seseorang",
+            "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_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",
+            "no_rooms": "Anda belum berada di ruangan mana pun",
+            "no_rooms_description": "Anda dapat membatalkan pilihan saringan untuk melihat percakapan Anda yang lain",
+            "no_unread": "Selamat! Anda tidak memiliki pesan yang belum dibaca",
+            "show_activity": "Lihat semua aktivitas",
+            "show_chats": "Tampilkan semua obrolan"
+        },
         "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",
+            "mentions": "Sebutan",
+            "people": "Orang",
+            "rooms": "Ruangan",
+            "unread": "Belum dibaca"
+        },
         "home_menu_label": "Opsi Beranda",
         "join_public_room_label": "Bergabung dengan ruangan publik",
         "joining_rooms_status": {
             "one": "Saat ini bergabung dengan %(count)s ruangan",
             "other": "Saat ini bergabung dengan %(count)s ruangan"
         },
+        "list_title": "Daftar ruangan",
+        "more_options": {
+            "copy_link": "Salin tautan ruangan",
+            "favourited": "Difavorit",
+            "leave_room": "Tinggalkan ruangan",
+            "low_priority": "Prioritas rendah",
+            "mark_read": "Tandai sebagai dibaca",
+            "mark_unread": "Tandai sebagai belum dibaca"
+        },
         "notification_options": "Opsi notifikasi",
+        "open_space_menu": "Buka menu space",
+        "primary_filters": "Filter daftar ruangan",
         "redacting_messages_status": {
             "one": "Saat ini menghapus pesan-pesan di %(count)s ruangan",
             "other": "Saat ini menghapus pesan-pesan di %(count)s ruangan"
         },
+        "room": {
+            "more_options": "Opsi Lainnya",
+            "open_room": "Buka ruangan %(roomName)s"
+        },
+        "room_options": "Opsi Ruangan",
         "show_less": "Tampilkan lebih sedikit",
         "show_n_more": {
             "one": "Tampilkan %(count)s lagi",
             "other": "Tampilkan %(count)s lagi"
         },
         "show_previews": "Tampilkan tampilan pesan",
+        "sort": "Urutkan",
         "sort_by": "Sortir berdasarkan",
         "sort_by_activity": "Aktivitas",
+        "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Aktivitas",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Tampilkan ruangan dengan pesan yang belum dibaca dahulu",
+        "space_menu": {
+            "home": "Beranda space",
+            "space_settings": "Pengaturan Space"
+        },
         "space_menu_label": "Menu %(spaceName)s",
         "sublist_options": "Tampilkan daftar opsi",
         "suggested_rooms_heading": "Ruangan yang Disarankan"
@@ -1975,6 +2232,8 @@
             "error_deleting_alias_description": "Terjadi sebuah kesalahan menghapus alamat. Itu mungkin sudah tidak ada atau ada kesalahan sementara.",
             "error_deleting_alias_description_forbidden": "Anda tidak memiliki izin untuk menghapus alamatnya.",
             "error_deleting_alias_title": "Terjadi kesalahan menghapus alamat",
+            "error_publishing": "Tidal dapat menerbitkan ruangan",
+            "error_publishing_detail": "Terjadi kesalahan saat menerbitkan ruangan ini",
             "error_save_space_settings": "Gagal untuk menyimpan pengaturan space.",
             "error_updating_alias_description": "Terjadi sebuah kesalahan memperbarui alamat alternatif ruangan. Ini mungkin tidak diperbolehkan oleh servernya atau ada kegagalan sementara.",
             "error_updating_canonical_alias_description": "Terjadi sebuah kesalahan memperbarui alamat utama ruangan. Ini mungkin tidak diperbolehkan oleh servernya atau ada kegagalan sementara.",
@@ -2128,8 +2387,9 @@
             },
             "join_rule_upgrade_upgrading_room": "Meningkatkan ruangan",
             "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.",
-            "strict_encryption": "Jangan kirim pesan terenkripsi ke sesi yang belum diverifikasi di ruangan ini dari sesi ini",
+            "strict_encryption": "Hanya kirim pesan ke pengguna terverifikasi.",
             "title": "Keamanan & Privasi"
         },
         "title": "Pengaturan Ruangan — %(roomName)s",
@@ -2183,6 +2443,10 @@
         "recent_changes_heading": "Perubahan terbaru yang belum diterima",
         "title": "Server tidak merespon"
     },
+    "service_worker_error": {
+        "description": "%(brand)s memerlukan pekerja layanan untuk memuat media yang diautentikasi dari repositori konten Matrix. Ini tidak didukung oleh peramban Anda sehingga Anda mungkin mengalami kegagalan pemuatan media.",
+        "title": "Gagal memuat pekerja layanan"
+    },
     "seshat": {
         "error_initialising": "Initialisasi pencarian pesan gagal, periksa <a>pengaturan Anda</a> untuk informasi lanjut",
         "reset_button": "Atur ulang penyimpanan peristiwa",
@@ -2199,6 +2463,8 @@
             "access_token_detail": "Token akses Anda memberikan akses penuh ke akun Anda. Jangan bagikan dengan siapa pun.",
             "brand_version": "Versi %(brand)s:",
             "clear_cache_reload": "Hapus cache dan muat ulang",
+            "crypto_version": "Versi kripto:",
+            "dialog_title": "<strong>Pengaturan:</strong> Bantuan & Tentang",
             "help_link": "Untuk bantuan dengan menggunakan %(brand)s, klik <a>di sini</a>.",
             "homeserver": "Homeserver adalah <code>%(homeserverUrl)s</code>",
             "identity_server": "Server identitas adalah <code>%(identityServerUrl)s</code>",
@@ -2207,21 +2473,34 @@
         }
     },
     "settings": {
+        "account": {
+            "dialog_title": "<strong>Pengaturan:</strong> Akun",
+            "title": "Akun"
+        },
         "all_rooms_home": "Tampilkan semua ruangan di Beranda",
         "all_rooms_home_description": "Semua ruangan yang Anda bergabung akan ditampilkan di Beranda.",
         "always_show_message_timestamps": "Selalu tampilkan stempel waktu pesan",
         "appearance": {
+            "bundled_emoji_font": "Gunakan fon emoji yang dibundel",
+            "compact_layout": "Tampilkan teks dan pesan ringkas",
+            "compact_layout_description": "Tata letak modern harus dipilih untuk menggunakan fitur ini.",
             "custom_font": "Gunakan sebuah font sistem",
             "custom_font_description": "Atur sebuah nama font yang terinstal di sistem Anda & %(brand)s akan mencoba menggunakannya.",
             "custom_font_name": "Nama font sistem",
             "custom_font_size": "Gunakan ukuran kustom",
-            "custom_theme_error_downloading": "Terjadi kesalahan saat mengunduh informasi tema.",
+            "custom_theme_add": "Tambahkan tema kustom",
+            "custom_theme_downloading": "Mengunduh tema kustom...",
+            "custom_theme_error_downloading": "Terjadi kesalahan mengunduh tema",
+            "custom_theme_help": "Masukkan URL tema kustom yang ingin Anda terapkan.",
             "custom_theme_invalid": "Skema tema tidak absah.",
+            "dialog_title": "<strong>Pengaturan:</strong> Penampilan",
             "font_size": "Ukuran font",
+            "font_size_default": "%(fontSize)s (bawaan)",
+            "high_contrast": "Kontras tinggi",
             "image_size_default": "Bawaan",
             "image_size_large": "Besar",
             "layout_bubbles": "Gelembung pesan",
-            "layout_irc": "IRC (Eksperimental)",
+            "layout_irc": "IRC (eksperimental)",
             "match_system_theme": "Sesuaikan dengan tema sistem",
             "timeline_image_size": "Ukuran gambar di lini masa"
         },
@@ -2232,9 +2511,80 @@
         "code_block_expand_default": "Buka blok kode secara bawaan",
         "code_block_line_numbers": "Tampilkan nomor barisan di blok kode",
         "disable_historical_profile": "Tampilkan foto profil dan nama saat ini untuk pengguna dalam riwayat pesan",
+        "discovery": {
+            "title": "Cara menemukan Anda"
+        },
         "emoji_autocomplete": "Aktifkan saran emoji saat mengetik",
         "enable_markdown": "Aktifkan Markdown",
         "enable_markdown_description": "Mulai pesan dengan <code>/plain</code> untuk mengirim tanpa Markdown.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Detail akun, kontak, preferensi, dan daftar obrolan Anda akan disimpan",
+                "breadcrumb_page": "Atur ulang enkripsi",
+                "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_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.",
+                "details_title": "Detail enkripsi",
+                "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_label": "Jangan pernah mengirim pesan terenkripsi ke perangkat yang tidak terverifikasi",
+                "other_people_device_title": "Perangkat orang lain",
+                "reset_identity": "Atur ulang identitas kriptografi",
+                "reset_in_progress": "Pengaturan ulang sedang berlangsung...",
+                "session_id": "ID sesi:",
+                "session_key": "Kunci sesi:",
+                "title": "Lanjutan"
+            },
+            "confirm_key_storage_off": "Apakah Anda yakin ingin tetap menonaktifkan penyimpanan kunci?",
+            "confirm_key_storage_off_description": "Jika Anda keluar dari semua perangkat, Anda akan kehilangan riwayat pesan dan perlu memverifikasi semua kontak yang ada lagi. <a> Pelajari lebih lanjut</a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "Hapus penyimpanan kunci",
+                "confirm": "Hapus penyimpanan kunci",
+                "description": "Menghapus penyimpanan kunci akan menghapus identitas kriptografi dan kunci pesan Anda dari server dan menonaktifkan fitur keamanan berikut:",
+                "list_first": "Anda tidak akan memiliki riwayat pesan terenkripsi di perangkat baru",
+                "list_second": "Anda akan kehilangan akses ke pesan terenkripsi jika Anda keluar dari %(brand)s di mana pun",
+                "title": "Apakah Anda yakin ingin mematikan penyimpanan kunci dan menghapusnya?"
+            },
+            "device_not_verified_button": "Verifikasi perangkat ini",
+            "device_not_verified_description": "Anda perlu memverifikasi perangkat ini untuk melihat pengaturan enkripsi Anda.",
+            "device_not_verified_title": "Perangkat tidak diverifikasi",
+            "dialog_title": "<strong>Pengaturan:</strong> Enkripsi",
+            "key_storage": {
+                "allow_key_storage": "Izinkan penyimpanan kunci",
+                "description": "Simpan identitas kriptografi dan kunci pesan Anda secara aman di server. Hal ini akan memungkinkan Anda untuk melihat riwayat pesan Anda di perangkat baru. <a>Pelajari lebih lanjut</a>",
+                "title": "Penyimpanan kunci"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "Konfirmasikan kunci pemulihan baru",
+                "change_recovery_confirm_description": "Masukkan kunci pemulihan baru Anda di bawah ini untuk menyelesaikannya. Kunci lama Anda tidak akan berfungsi lagi.",
+                "change_recovery_confirm_title": "Masukkan kunci pemulihan baru Anda",
+                "change_recovery_key": "Ubah kunci pemulihan",
+                "change_recovery_key_description": "Tuliskan kunci pemulihan baru ini di tempat yang aman. Kemudian klik Lanjutkan untuk mengonfirmasi perubahan.",
+                "change_recovery_key_title": "Ubah kunci pemulihan?",
+                "description": "Pulihkan identitas kriptografi dan riwayat pesan Anda dengan kunci pemulihan jika Anda kehilangan semua perangkat yang ada.",
+                "enter_key_error": "Kunci pemulihan yang Anda masukkan salah.",
+                "enter_recovery_key": "Masukkan kunci pemulihan",
+                "forgot_recovery_key": "Lupa kunci pemulihan?",
+                "key_storage_warning": "Penyimpanan kunci Anda tidak tersinkron. Klik tombol di bawah ini untuk memperbaiki masalah.",
+                "save_key_description": "Jangan bagikan ini kepada siapa pun!",
+                "save_key_title": "Kunci pemulihan",
+                "set_up_recovery": "Siapkan pemulihan",
+                "set_up_recovery_confirm_button": "Selesaikan penyiapan",
+                "set_up_recovery_confirm_description": "Masukkan kunci pemulihan yang ditunjukkan pada layar sebelumnya untuk menyelesaikan penyiapan pemulihan.",
+                "set_up_recovery_confirm_title": "Masukkan kunci pemulihan Anda untuk mengonfirmasi",
+                "set_up_recovery_description": "Penyimpanan kunci Anda dilindungi oleh kunci pemulihan. Jika Anda memerlukan kunci pemulihan baru setelah penyiapan, Anda dapat membuatnya kembali dengan memilih '%(changeRecoveryKeyButton)s'.",
+                "set_up_recovery_save_key_description": "Catatlah kunci pemulihan ini di tempat yang aman, seperti pengelola kata sandi, catatan terenkripsi, atau brankas fisik.",
+                "set_up_recovery_save_key_title": "Simpan kunci pemulihan Anda di tempat yang aman",
+                "set_up_recovery_secondary_description": "Setelah mengeklik lanjutkan, kami akan membuat kunci pemulihan untuk Anda.",
+                "title": "Pemulihan"
+            },
+            "title": "Enkripsi"
+        },
         "general": {
             "account_management_section": "Manajemen akun",
             "account_section": "Akun",
@@ -2247,6 +2597,14 @@
             "add_msisdn_dialog_title": "Tambahkan Nomor Telepon",
             "add_msisdn_instructions": "Sebuah teks pesan telah dikirim ke +%(msisdn)s. Silakan masukkan kode verifikasinya.",
             "add_msisdn_misconfigured": "Aliran penambahan/pengaitan MSISDN tidak diatur dengan benar",
+            "allow_spellcheck": "Izinkan pemeriksaan ejaan",
+            "application_language": "Bahasa aplikasi",
+            "application_language_reload_hint": "Aplikasi akan dimuat ulang setelah memilih bahasa lain",
+            "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.",
+            "avatar_upload_error_text_generic": "Format berkas mungkin tidak didukung.",
+            "avatar_upload_error_title": "Gambar avatar tidak dapat diunggah",
             "confirm_adding_email_body": "Klik tombol di bawah untuk mengkonfirmasi penambahan alamat email ini.",
             "confirm_adding_email_title": "Konfirmasi penambahan email",
             "deactivate_confirm_body": "Apakah Anda yakin ingin menonaktifkan akun Anda? Ini tidak dapat dibatalkan.",
@@ -2262,10 +2620,14 @@
             "deactivate_confirm_erase_label": "Sembunyikan pesan saya dari orang baru bergabung",
             "deactivate_section": "Nonaktifkan Akun",
             "deactivate_warning": "Menonaktifkan akun Anda adalah aksi yang permanen — hati-hati!",
-            "discovery_email_empty": "Opsi penemuan akan tersedia setelah Anda telah menambahkan sebuah email di atas.",
+            "discovery_email_empty": "Opsi penemuan akan muncul setelah Anda menambahkan surel.",
             "discovery_email_verification_instructions": "Verifikasi tautannya di kotak masuk Anda",
-            "discovery_msisdn_empty": "Opsi penemuan akan tersedia setelah Anda telah menambahkan sebuah nomor telepon di atas.",
+            "discovery_msisdn_empty": "Opsi penemuan akan muncul setelah Anda telah menambahkan nomor telepon.",
             "discovery_needs_terms": "Terima Ketentuan Layanannya server identitas %(serverName)s untuk mengizinkan Anda untuk dapat ditemukan dengan alamat email atau nomor telepon.",
+            "discovery_needs_terms_title": "Biarkan orang lain menemukan Anda",
+            "display_name": "Nama Tampilan",
+            "display_name_error": "Tidak dapat mengatur nama tampilan",
+            "email_adding_unsupported_by_hs": "Homeserver ini tidak mendukung penambahan alamat surel ke akun Anda.",
             "email_address_in_use": "Alamat email ini telah dipakai",
             "email_address_label": "Alamat Email",
             "email_not_verified": "Alamat email Anda belum diverifikasi",
@@ -2290,7 +2652,9 @@
             "error_share_msisdn_discovery": "Tidak dapat membagikan nomor telepon",
             "identity_server_no_token": "Tidak ada token akses identitas yang ditemukan",
             "identity_server_not_set": "Server identitas tidak diatur",
-            "language_section": "Bahasa dan wilayah",
+            "invalid_phone_number": "Nomor telepon yang diberikan tampaknya tidak valid.",
+            "language_section": "Bahasa",
+            "msisdn_adding_unsupported_by_hs": "Homeserver ini tidak mendukung penambahan nomor telepon ke akun Anda.",
             "msisdn_in_use": "Nomor telepon ini telah dipakai",
             "msisdn_label": "Nomor Telepon",
             "msisdn_verification_field_label": "Kode verifikasi",
@@ -2299,11 +2663,16 @@
             "oidc_manage_button": "Kelola akun",
             "password_change_section": "Atur kata sandi akun baru…",
             "password_change_success": "Kata sandi Anda berhasil diubah.",
+            "personal_info": "Info pribadi",
+            "profile_subtitle": "Ini adalah bagaimana Anda akan terlihat kepada orang lain dalam aplikasi.",
+            "profile_subtitle_oidc": "Akun Anda dikelola secara terpisah oleh penyedia identitas sehingga beberapa informasi pribadi Anda tidak dapat diubah di sini.",
             "remove_email_prompt": "Hapus %(email)s?",
             "remove_msisdn_prompt": "Hapus %(phone)s?",
-            "spell_check_locale_placeholder": "Pilih locale"
+            "spell_check_locale_placeholder": "Pilih locale",
+            "unable_to_load_emails": "Tidak dapat memuat alamat surel",
+            "unable_to_load_msisdns": "Tidak dapat memuat nomor telepon",
+            "username": "Nama pengguna"
         },
-        "image_thumbnails": "Tampilkan gambar mini untuk gambar",
         "inline_url_previews_default": "Aktifkan tampilan URL secara bawaan",
         "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)",
@@ -2325,13 +2694,13 @@
                 "enter_phrase_description": "Masukkan frasa keamanan yang hanya Anda tahu, yang digunakan untuk mengamankan data Anda. Supaya aman, jangan menggunakan ulang kata sandi akun Anda.",
                 "enter_phrase_title": "Masukkan sebuah Frasa Keamanan",
                 "enter_phrase_to_confirm": "Masukkan Frasa Keamanan sekali lagi untuk mengkonfirmasinya.",
-                "generate_security_key_description": "Kami akan membuat sebuah Kunci Keamanan untuk Anda simpan di tempat yang aman, seperti manajer sandi atau brankas.",
-                "generate_security_key_title": "Buat sebuah Kunci Keamanan",
+                "generate_security_key_description": "Kami akan membuat Kunci Pemulihan untuk Anda simpan di tempat yang aman, seperti pengelola kata sandi atau brankas.",
+                "generate_security_key_title": "Buat Kunci Pemulihan",
                 "pass_phrase_match_failed": "Itu tidak cocok.",
                 "pass_phrase_match_success": "Mereka cocok!",
                 "phrase_strong_enough": "Hebat! Frasa Keamanan ini kelihatannya kuat.",
                 "secret_storage_query_failure": "Tidak dapat menanyakan status penyimpanan rahasia",
-                "security_key_safety_reminder": "Simpan Kunci Keamanan Anda di tempat yang aman, seperti manajer sandi atau sebuah brankas, yang digunakan untuk mengamankan data terenkripsi Anda.",
+                "security_key_safety_reminder": "Simpan Kunci Pemulihan Anda di tempat yang aman, seperti pengelola kata sandi atau brankas, karena digunakan untuk melindungi data terenkripsi Anda.",
                 "set_phrase_again": "Pergi kembali untuk menyiapkannya lagi.",
                 "settings_reminder": "Anda juga dapat menyiapkan Cadangan Aman & kelola kunci Anda di Pengaturan.",
                 "title_confirm_phrase": "Konfirmasi Frasa Keamanan",
@@ -2339,7 +2708,7 @@
                 "title_set_phrase": "Atur sebuah Frasa Keamanan",
                 "unable_to_setup": "Tidak dapat menyiapkan penyimpanan rahasia",
                 "use_different_passphrase": "Gunakan frasa sandi yang berbeda?",
-                "use_phrase_only_you_know": "Gunakan frasa rahasia yang hanya Anda tahu, dan simpan sebuah Kunci Keamanan untuk menggunakannya untuk cadangan secara opsional."
+                "use_phrase_only_you_know": "Gunakan frasa rahasia yang hanya Anda ketahui, dan secara opsional simpan Kunci Pemulihan untuk digunakan untuk cadangan."
             }
         },
         "key_export_import": {
@@ -2357,12 +2726,28 @@
             "phrase_strong_enough": "Hebat! Frasa keamanan ini kelihatannya kuat"
         },
         "keyboard": {
+            "dialog_title": "<strong>Pengaturan:</strong> Papan Ketik",
             "title": "Papan tik"
         },
+        "labs": {
+            "dialog_title": "<strong>Pengaturan:</strong> Uji Coba"
+        },
+        "labs_mjolnir": {
+            "dialog_title": "<strong>Pengaturan:</strong> Pengguna yang Diabaikan"
+        },
+        "media_preview": {
+            "hide_avatars": "Sembunyikan avatar ruangan dan pengundang",
+            "hide_media": "Selalu sembunyikan",
+            "media_preview_description": "Media tersembunyi selalu dapat ditampilkan dengan mengetuknya",
+            "media_preview_label": "Tampilkan media di lini masa",
+            "show_in_private": "Di ruangan privat",
+            "show_media": "Selalu tampilkan"
+        },
         "notifications": {
             "default_setting_description": "Pengaturan ini akan diterapkan secara bawaan ke semua ruangan Anda.",
             "default_setting_section": "Saya ingin diberi tahu (Pengaturan Bawaan)",
             "desktop_notification_message_preview": "Tampilkan tampilan pesan di notifikasi desktop",
+            "dialog_title": "<strong>Pengaturan:</strong> Notifikasi",
             "email_description": "Terima surel ikhtisar notifikasi yang terlewat",
             "email_section": "Kirim surel ikhtisar",
             "email_select": "Pilih surel mana yang ingin dikirimkan ikhtisar. Kelola surel Anda di <button>Umum</button>.",
@@ -2421,12 +2806,15 @@
             "code_blocks_heading": "Blok kode",
             "compact_modern": "Gunakan tata letak 'Modern' yang lebih kecil",
             "composer_heading": "Komposer",
+            "default_timezone": "Bawaan peramban (%(timezone)s)",
+            "dialog_title": "<strong>Pengaturan:</strong> Preferensi",
             "enable_hardware_acceleration": "Aktifkan akselerasi perangkat keras",
             "enable_tray_icon": "Tampilkan ikon baki dan minimalkan window ke ikonnya jika ditutup",
             "keyboard_heading": "Pintasan keyboard",
             "keyboard_view_shortcuts_button": "Untuk melihat semua shortcut keyboard, <a>klik di sini</a>.",
             "media_heading": "Gambar, GIF, dan video",
             "presence_description": "Bagikan aktivitas dan status Anda dengan orang lain.",
+            "publish_timezone": "Terbitkan zona waktu di profil publik",
             "rm_lifetime": "Delay Penanda Bacaan (md)",
             "rm_lifetime_offscreen": "Delay Penanda Bacaan diluar layar (md)",
             "room_directory_heading": "Direktori ruangan",
@@ -2434,59 +2822,26 @@
             "show_avatars_pills": "Tampilkan avatar di sebutan pengguna, ruangan, dan peristiwa",
             "show_polls_button": "Tampilkan tombol pemungutan suara",
             "surround_text": "Kelilingi teks yang dipilih saat mengetik karakter khusus",
-            "time_heading": "Tampilkan waktu"
+            "time_heading": "Tampilkan waktu",
+            "user_timezone": "Atur zona waktu"
         },
         "prompt_invite": "Tanyakan sebelum mengirim undangan ke ID Matrix yang mungkin tidak absah",
         "replace_plain_emoji": "Ganti emoji teks biasa secara otomatis",
         "security": {
-            "4s_public_key_in_account_data": "di data akun",
-            "4s_public_key_status": "Kunci publik penyimpanan rahasia:",
             "analytics_description": "Bagikan data anonim untuk membantu kami mengenal masalah. Tidak ada yang pribadi. Tanpa pihak ketiga.",
-            "backup_key_cached_status": "Cadangan kunci dicache:",
-            "backup_key_stored_status": "Cadangan kunci disimpan:",
-            "backup_key_unexpected_type": "tipe yang tidak terduga",
-            "backup_key_well_formed": "terbentuk dengan baik",
-            "backup_keys_description": "Cadangkan kunci enkripsi Anda dengan data akun Anda jika Anda kehilangan akses ke sesi-sesi Anda. Kunci Anda akan diamankan dengan Kunci Keamanan yang unik.",
             "bulk_options_accept_all_invites": "Terima semua %(invitedRooms)s undangan",
             "bulk_options_reject_all_invites": "Tolak semua %(invitedRooms)s undangan",
             "bulk_options_section": "Opsi massal",
-            "cross_signing_cached": "dicache secara lokal",
-            "cross_signing_homeserver_support": "Dukungan fitur homeserver:",
-            "cross_signing_homeserver_support_exists": "sudah ada",
-            "cross_signing_in_4s": "di penyimpanan rahasia",
-            "cross_signing_in_memory": "di penyimpanan",
-            "cross_signing_master_private_Key": "Kunci privat utama:",
-            "cross_signing_not_cached": "tidak ditemukan secara lokal",
-            "cross_signing_not_found": "tidak ditemukan",
-            "cross_signing_not_in_4s": "tidak ditemukan di penyimpanan",
-            "cross_signing_not_stored": "tidak disimpan",
-            "cross_signing_private_keys": "Kunci privat penandatanganan silang:",
-            "cross_signing_public_keys": "Kunci publik penandatanganan silang:",
-            "cross_signing_self_signing_private_key": "Kunci privat penandatanganan diri:",
-            "cross_signing_user_signing_private_key": "Kunci rahasia penandatanganan pengguna:",
-            "cryptography_section": "Kriptografi",
-            "delete_backup": "Hapus Cadangan",
-            "delete_backup_confirm_description": "Apakah Anda yakin? Anda akan kehilangan pesan terenkripsi jika kunci Anda tidak dicadangkan dengan benar.",
+            "dehydrated_device_description": "Fitur perangkat luring memungkinkan Anda menerima pesan terenkripsi bahkan ketika Anda tidak masuk ke perangkat apa pun",
+            "dehydrated_device_enabled": "Perangkat luring diaktifkan",
+            "dialog_title": "<strong>Pengaturan:</strong> Keamanan & Privasi",
             "e2ee_default_disabled_warning": "Admin server Anda telah menonaktifkan enkripsi ujung ke ujung secara bawaan di ruangan privat & Pesan Langsung.",
             "enable_message_search": "Aktifkan pencarian pesan di ruangan terenkripsi",
             "encryption_section": "Enkripsi",
-            "error_loading_key_backup_status": "Tidak dapat memuat status pencadangan kunci",
-            "export_megolm_keys": "Ekspor kunci ruangan enkripsi ujung ke ujung",
             "ignore_users_empty": "Anda tidak memiliki pengguna yang diabaikan.",
             "ignore_users_section": "Pengguna yang diabaikan",
-            "import_megolm_keys": "Impor kunci enkripsi ujung ke ujung",
-            "key_backup_active": "Sesi ini mencadangkan kunci Anda.",
-            "key_backup_active_version": "Versi cadangan aktif:",
-            "key_backup_active_version_none": "Tidak Ada",
             "key_backup_algorithm": "Algoritma:",
-            "key_backup_can_be_restored": "Cadangan ini dapat dipulihkan di sesi ini",
-            "key_backup_complete": "Semua kunci telah dicadangkan",
             "key_backup_connect": "Hubungkan sesi ini ke Pencadangan Kunci",
-            "key_backup_connect_prompt": "Hubungkan sesi ini ke pencadangan kunci sebelum keluar untuk menghindari kehilangan kunci apa saja yang mungkin hanya ada di sesi ini.",
-            "key_backup_in_progress": "Mencadangkan %(sessionsRemaining)s kunci…",
-            "key_backup_inactive": "Sesi ini <b>tidak mencadangkan kunci Anda</b>, tetapi Anda memiliki cadangan yang ada yang dapat Anda pulihkan dan tambahkan untuk selanjutnya.",
-            "key_backup_inactive_warning": "Kunci Anda <b>tidak dicadangan dari sesi ini</b>.",
-            "key_backup_latest_version": "Versi cadangan terbaru di server:",
             "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": {
@@ -2506,14 +2861,8 @@
             "message_search_unsupported": "%(brand)s tidak memiliki beberapa komponen yang diperlukan untuk menyimpan pesan terenkripsi secara lokal dengan aman. Jika Anda ingin bereksperimen dengan fitur ini, buat %(brand)s Desktop yang khusus dengan <nativeLink>tambahan komponen penelusuran</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s tidak dapat menyimpan pesan terenkripsi secara lokal dengan aman saat dijalankan di browser. Gunakan <desktopLink>%(brand)s Desktop</desktopLink> supaya pesan terenkripsi dapat muncul di hasil pencarian.",
             "record_session_details": "Rekam nama, versi, dan URL klien untuk dapat mengenal sesi dengan lebih mudah dalam pengelola sesi",
-            "restore_key_backup": "Pulihkan dari Cadangan",
-            "secret_storage_not_ready": "belum siap",
-            "secret_storage_ready": "siap",
-            "secret_storage_status": "Penyimpanan rahasia:",
             "send_analytics": "Kirim data analitik",
-            "session_id": "ID Sesi:",
-            "session_key": "Kunci sesi:",
-            "strict_encryption": "Jangan kirim pesan terenkripsi ke sesi yang belum diverifikasi dari sesi ini"
+            "strict_encryption": "Hanya kirim pesan ke pengguna terverifikasi"
         },
         "send_read_receipts": "Kirim laporan dibaca",
         "send_read_receipts_unsupported": "Server Anda tidak mendukung penonaktifkan pengiriman laporan dibaca.",
@@ -2544,6 +2893,7 @@
             "device_unverified_description_current": "Verifikasi sesi Anda saat ini untuk perpesanan aman yang ditingkatkan.",
             "device_verified_description": "Sesi ini siap untuk perpesanan yang aman.",
             "device_verified_description_current": "Sesi Anda saat ini siap untuk perpesanan aman.",
+            "dialog_title": "<strong>Pengaturan:</strong> Sesi",
             "error_pusher_state": "Gagal menetapkan keadaan pendorong",
             "error_set_name": "Gagal mengatur nama sesi",
             "filter_all": "Semua",
@@ -2560,6 +2910,7 @@
             "inactive_sessions_list_description": "Pertimbangkan untuk mengeluarkan sesi lama (%(inactiveAgeDays)s hari atau lebih) yang Anda tidak gunakan lagi.",
             "ip": "Alamat IP",
             "last_activity": "Aktivitas terakhir",
+            "manage": "Kelola sesi ini",
             "mobile_session": "Sesi ponsel",
             "n_sessions_selected": {
                 "one": "%(count)s sesi dipilih",
@@ -2583,9 +2934,10 @@
             "security_recommendations_description": "Tingkatkan keamanan akun Anda dengan mengikuti saran berikut.",
             "session_id": "ID Sesi",
             "show_details": "Tampilkan detail",
-            "sign_in_with_qr": "Masuk dengan kode QR",
+            "sign_in_with_qr": "Tautkan perangkat baru",
             "sign_in_with_qr_button": "Tampilkan kode QR",
-            "sign_in_with_qr_description": "Anda dapat menggunakan perangkat ini untuk masuk ke perangkat yang baru dengan sebuah kode QR. Anda harus memindai kode QR yang ditampilkan di perangkat ini dengan perangkat Anda yang telah keluar dari akun.",
+            "sign_in_with_qr_description": "Gunakan kode QR untuk masuk ke akun di perangkat lain dan menyiapkan perpesanan aman.",
+            "sign_in_with_qr_unsupported": "Tidak didukung oleh penyedia akun Anda",
             "sign_out": "Keluarkan sesi ini",
             "sign_out_all_other_sessions": "Keluar dari semua sesi lain (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
@@ -2625,7 +2977,9 @@
         "show_redaction_placeholder": "Tampilkan sebuah penampung untuk pesan terhapus",
         "show_stickers_button": "Tampilkan tombol stiker",
         "show_typing_notifications": "Tampilkan notifikasi pengetikan",
+        "showbold": "Tampilkan semua aktivitas dalam daftar ruangan (titik atau jumlah pesan belum dibaca)",
         "sidebar": {
+            "dialog_title": "<strong>Pengaturan:</strong> Bilah Samping",
             "metaspaces_favourites_description": "Kelompokkan semua ruangan dan orang favorit Anda di satu tempat.",
             "metaspaces_home_all_rooms": "Tampilkan semua ruangan",
             "metaspaces_home_all_rooms_description": "Tampilkan semua ruangan di Beranda, walaupun mereka berada di sebuah space.",
@@ -2634,10 +2988,14 @@
             "metaspaces_orphans_description": "Kelompokkan semua ruangan yang tidak ada di sebuah space di satu tempat.",
             "metaspaces_people_description": "Kelompokkan semua orang di satu tempat.",
             "metaspaces_subsection": "Space yang ditampilkan",
+            "metaspaces_video_rooms": "Ruangan dan konferensi video",
+            "metaspaces_video_rooms_description": "Kelompokkan semua ruangan dan konferensi video privat.",
+            "metaspaces_video_rooms_description_invite_extension": "Dalam konferensi, Anda dapat mengundang orang-orang di luar Matrix.",
             "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",
+        "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",
         "use_command_f_search": "Gunakan ⌘ + F untuk cari di lini masa",
@@ -2651,6 +3009,7 @@
             "audio_output_empty": "Tidak ada output audio yang terdeteksi",
             "auto_gain_control": "Kendali suara otomatis",
             "connection_section": "Koneksi",
+            "dialog_title": "<strong>Pengaturan:</strong> Suara & Video",
             "echo_cancellation": "Pembatalan gema",
             "enable_fallback_ice_server": "Perbolehkan server bantuan panggilan cadangan (%(server)s)",
             "enable_fallback_ice_server_description": "Hanya diterapkan jika homeserver Anda tidak menyediakan satu. Alamat IP Anda akan dibagikan selama panggilan berlangsung.",
@@ -2669,8 +3028,12 @@
         "warning": "<w>PERINGATAN:</w> <description/>"
     },
     "share": {
+        "link_copied": "Tautan disalin",
         "permalink_message": "Tautan ke pesan yang dipilih",
         "permalink_most_recent": "Tautan ke pesan terkini",
+        "share_call": "Tautan undangan konferensi",
+        "share_call_subtitle": "Tautan bagi pengguna eksternal untuk bergabung ke panggilan tanpa akun Matrix:",
+        "title_link": "Bagikan Tautan",
         "title_message": "Bagikan Pesan Ruangan",
         "title_room": "Bagikan Ruangan",
         "title_user": "Bagikan Pengguna"
@@ -2741,8 +3104,6 @@
         "topic": "Mendapatkan atau mengatur topik ruangan",
         "topic_none": "Ruangan ini tidak ada topik.",
         "topic_room_error": "Gagal untuk mendapatkan topik ruangan: Tidak dapat menemukan ruangan (%(roomId)s)",
-        "tovirtual": "Mengganti ke ruangan virtual ruangan ini, jika tersedia",
-        "tovirtual_not_found": "Tidak ada ruangan virtual untuk ruangan ini",
         "unban": "Menhilangkan cekalan pengguna dengan ID yang dicantumkan",
         "unflip": "Menambahkan ┬──┬ ノ( ゜-゜ノ) ke pesan teks biasa",
         "unholdcall": "Melanjutkan panggilan di ruang saat ini",
@@ -2760,6 +3121,7 @@
         "view": "Menampilkan ruangan dengan alamat yang ditentukan",
         "whois": "Menampilkan informasi tentang sebuah pengguna"
     },
+    "sliding_sync_legacy_no_longer_supported": "Sinkronisasi geser lama tidak lagi didukung: silakan keluar dan masuk kembali untuk mengaktifkan bendera sinkronisasi geser yang baru",
     "space": {
         "add_existing_room_space": {
             "create": "Ingin menambahkan sebuah ruangan yang baru saja?",
@@ -2858,21 +3220,22 @@
         },
         "create_new_room_button": "Buat ruangan baru",
         "failed_querying_public_rooms": "Gagal melakukan kueri ruangan publik",
+        "failed_querying_public_spaces": "Gagal melakukan kueri space publik",
         "group_chat_section_title": "Opsi lain",
         "heading_with_query": "Gunakan \"%(query)s\" untuk mencari",
         "heading_without_query": "Cari",
         "join_button_text": "Bergabung dengan %(roomAddress)s",
         "keyboard_scroll_hint": "Gunakan <arrows/> untuk menggulirkan",
-        "message_search_section_title": "Pencarian lainnya",
+        "messages_label": "Pesan",
         "other_rooms_in_space": "Ruangan lainnya di %(spaceName)s",
         "public_rooms_label": "Ruangan publik",
+        "public_spaces_label": "Space publik",
         "recent_searches_section_title": "Pencarian terkini",
         "recently_viewed_section_title": "Baru saja dilihat",
         "remove_filter": "Hapus saringan pencarian untuk %(filter)s",
         "result_may_be_hidden_privacy_warning": "Beberapa hasil mungkin disembunyikan untuk privasi",
         "result_may_be_hidden_warning": "Beberapa hasil mungkin tersembunyi",
         "search_dialog": "Dialog Pencarian",
-        "search_messages_hint": "Untuk mencari pesan-pesan, lihat ikon ini di atas ruangan <icon/>",
         "spaces_title": "Space yang Anda berada",
         "start_group_chat_button": "Mulai sebuah grup obrolan"
     },
@@ -2909,12 +3272,20 @@
             "one": "%(count)s balasan",
             "other": "%(count)s balasan"
         },
+        "empty_description": "Gunakan “%(replyInThread)s” ketika berada di atas pesan.",
+        "empty_title": "Utas membantu percakapan Anda sesuai dengan topik dan mudah untuk dilacak.",
         "error_start_thread_existing_relation": "Tidak dapat membuat utasan dari sebuah peristiwa dengan relasi yang sudah ada",
+        "mark_all_read": "Tandai semua sebagai dibaca",
         "my_threads": "Utasan saya",
         "my_threads_description": "Menampilkan semua utasan yang Anda berpartisipasi",
         "open_thread": "Buka utasan",
         "show_thread_filter": "Tampilkan:"
     },
+    "threads_activity_centre": {
+        "header": "Aktivitas utas",
+        "no_rooms_with_threads_notifs": "Anda belum memiliki ruangan dengan notifikasi utas.",
+        "no_rooms_with_unread_threads": "Anda belum memiliki ruangan dengan utas yang belum dibaca."
+    },
     "time": {
         "about_day_ago": "1 hari yang lalu",
         "about_hour_ago": "1 jam yang lalu",
@@ -2956,9 +3327,21 @@
         },
         "creation_summary_dm": "%(creator)s membuat pesan langsung ini.",
         "creation_summary_room": "%(creator)s membuat dan mengatur ruangan ini.",
+        "decryption_failure": {
+            "blocked": "Pengirim telah mencegah Anda menerima pesan ini",
+            "historical_event_no_key_backup": "Riwayat pesan tidak tersedia di perangkat ini",
+            "historical_event_unverified_device": "Anda harus memverifikasi perangkat ini untuk mengakses riwayat pesan",
+            "historical_event_user_not_joined": "Anda tidak memiliki akses ke pesan ini",
+            "sender_identity_previously_verified": "Identitas terverifikasi telah berubah",
+            "sender_unsigned_device": "Dienkripsi oleh perangkat yang tidak diverifikasi oleh pemiliknya.",
+            "unable_to_decrypt": "Tidak dapat mendekripsi pesan"
+        },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Mendekripsi",
         "download_action_downloading": "Mengunduh",
+        "download_failed": "Pengunduhan gagal",
+        "download_failed_description": "Terjadi kesalahan saat mengunduh berkas ini",
+        "e2e_state": "Keadaan enkripsi ujung ke ujung",
         "edits": {
             "tooltip_label": "Diedit di %(date)s. Klik untuk melihat editan.",
             "tooltip_sub": "Klik untuk melihat editan",
@@ -2969,6 +3352,7 @@
         "historical_messages_unavailable": "Anda tidak dapat melihat pesan-pesan awal",
         "in_room_name": " di <strong>%(room)s</strong>",
         "io.element.widgets.layout": "%(senderName)s telah memperbarui tata letak ruangan",
+        "late_event_separator": "Awalnya dikirim %(dateTime)s",
         "load_error": {
             "no_permission": "Mencoba memuat titik spesifik di lini masa ruangan ini, tetapi Anda tidak memiliki izin untuk menampilkan pesannya.",
             "title": "Gagal untuk memuat posisi lini masa",
@@ -3011,7 +3395,7 @@
         },
         "m.file": {
             "error_decrypting": "Terjadi kesalahan mendekripsi lampiran",
-            "error_invalid": "File tidak absah%(extra)s"
+            "error_invalid": "Berkas tidak valid"
         },
         "m.image": {
             "error": "Tidak dapat menampilkan gambar karena kesalahan",
@@ -3112,6 +3496,7 @@
             "left_reason": "%(targetName)s keluar dari ruangan ini: %(reason)s",
             "no_change": "%(senderName)s tidak membuat perubahan",
             "reject_invite": "%(targetName)s menolak undangannya",
+            "reject_invite_reason": "%(targetName)s menolak undangan: %(reason)s",
             "remove_avatar": "%(senderName)s menghilangkan foto profilnya",
             "remove_name": "%(senderName)s menghilangkan nama tampilannya (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s mengatur foto profil",
@@ -3148,11 +3533,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s meningkatkan ruangan ini.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\"."
+            "changed": "%(senderDisplayName)s telah mengubah topik menjadi \"%(topic)s\".",
+            "removed": "%(senderDisplayName)s menghapus topik."
         },
         "m.sticker": "%(senderDisplayName)s mengirim sebuah stiker.",
         "m.video": {
-            "error_decrypting": "Terjadi kesalahan mendekripsi video"
+            "error_decrypting": "Terjadi kesalahan mendekripsi video",
+            "show_video": "Tampilkan video"
         },
         "m.widget": {
             "added": "Widget %(widgetName)s ditambahkan oleh %(senderName)s",
@@ -3171,6 +3558,8 @@
             "label": "Aksi Pesan",
             "view_in_room": "Tampilkan di ruangan"
         },
+        "message_timestamp_received_at": "Diterima pada: %(dateTime)s",
+        "message_timestamp_sent_at": "Dikirim pada: %(dateTime)s",
         "mjolnir": {
             "changed_rule_glob": "%(senderName)s memperbarui sebuah peraturan pencekalan yang sebelumnya berisi %(oldGlob)s ke %(newGlob)s untuk %(reason)s",
             "changed_rule_rooms": "%(senderName)s mengubah sebuah peraturan pencekalan ruangan yang sebelumnya berisi %(oldGlob)s ke %(newGlob)s untuk %(reason)s",
@@ -3198,7 +3587,8 @@
         "reactions": {
             "add_reaction_prompt": "Tambahkan reaksi",
             "custom_reaction_fallback_label": "Reaksi khusus",
-            "label": "%(reactors)s berekasi dengan %(content)s"
+            "label": "%(reactors)s berekasi dengan %(content)s",
+            "tooltip_caption": "bereaksi dengan %(shortName)s"
         },
         "read_receipt_title": {
             "one": "Dilihat oleh %(count)s orang",
@@ -3383,6 +3773,10 @@
     "truncated_list_n_more": {
         "other": "Dan %(count)s lagi..."
     },
+    "unsupported_browser": {
+        "description": "Jika Anda lanjut, beberapa fitur dapat berhenti bekerja dan ada risiko kehilangan data di masa mendatang. Perbarui peramban Anda untuk terus menggunakan %(brand)s.",
+        "title": "%(brand)s tidak mendukung peramban ini"
+    },
     "unsupported_server_description": "Server ini menjalankan sebuah versi Matrix yang lama. Tingkatkan ke Matrix %(version)s untuk menggunakan %(brand)s tanpa eror.",
     "unsupported_server_title": "Server Anda tidak didukung",
     "update": {
@@ -3400,6 +3794,13 @@
         "toast_title": "Perbarui %(brand)s",
         "unavailable": "Tidak Tersedia"
     },
+    "update_room_access_modal": {
+        "description": "Untuk membuat tautan berbagi, jadikan ruangan ini <b>publik</b> atau aktifkan opsi bagi pengguna untuk <b>meminta bergabung</b>. Hal ini memungkinkan tamu untuk bergabung tanpa diundang.",
+        "dont_change_description": "Jika Anda tidak ingin mengubah akses ruangan ini, Anda dapat membuat ruang baru untuk tautan panggilan.",
+        "no_change": "Saya tidak ingin mengubah tingkat akses.",
+        "revert_access_description": "(Ini dapat dikembalikan ke nilai sebelumnya di Pengaturan Ruangan: <b>Keamanan & Privasi</b> / <b>Akses</b>)",
+        "title": "Izinkan pengguna tamu untuk bergabung dengan ruangan ini"
+    },
     "upload_failed_generic": "File '%(fileName)s' gagal untuk diunggah.",
     "upload_failed_size": "File '%(fileName)s' melebihi batas ukuran unggahan file homeserver",
     "upload_failed_title": "Unggahan Gagal",
@@ -3409,6 +3810,7 @@
         "error_files_too_large": "File-file ini <b>terlalu besar</b> untuk diunggah. Batas ukuran unggahan file adalah %(limit)s.",
         "error_some_files_too_large": "Beberapa file <b>terlalu besar</b> untuk diunggah. Batas ukuran unggahan file adalah %(limit)s.",
         "error_title": "Kesalahan saat Mengunggah",
+        "not_image": "Berkas yang Anda pilih bukan berkas gambar yang valid.",
         "title": "Unggah file",
         "title_progress": "Mengunggah file (%(current)s dari %(total)s)",
         "upload_all_button": "Unggah semua",
@@ -3440,6 +3842,7 @@
         "error_mute_user": "Gagal untuk membisukan pengguna",
         "error_revoke_3pid_invite_description": "Tidak dapat menghapus undangan. Server ini mungkin mengalami masalah sementara atau Anda tidak memiliki izin yang dibutuhkan untuk menghapus undangannya.",
         "error_revoke_3pid_invite_title": "Gagal untuk menghapus undangan",
+        "ignore_button": "Abaikan",
         "ignore_confirm_description": "Semua pesan dan undangan dari pengguna ini akan disembunyikan. Apakah Anda yakin ingin mengabaikan?",
         "ignore_confirm_title": "Abaikan %(user)s",
         "invited_by": "Diundang oleh %(sender)s",
@@ -3467,23 +3870,27 @@
             "no_recent_messages_description": "Coba gulir ke atas di lini masa untuk melihat apa ada pesan-pesan sebelumnya.",
             "no_recent_messages_title": "Tidak ada pesan terkini dari %(user)s yang ditemukan"
         },
-        "redact_button": "Hapus pesan terkini",
+        "redact_button": "Hapus pesan",
         "revoke_invite": "Hapus undangan",
         "room_encrypted": "Pesan di ruangan ini terenkripsi secara ujung ke ujung.",
         "room_encrypted_detail": "Pesan Anda diamankan dan hanya Anda dan penerimanya mempunyai kunci yang unik untuk mengaksesnya.",
         "room_unencrypted": "Pesan di ruangan ini tidak dienkripsi secara ujung ke ujung.",
         "room_unencrypted_detail": "Di ruangan terenkripsi, pesan Anda diamankan dan hanya Anda dan penerimanya mempunyai kunci yang unik untuk mengaksesnya.",
-        "share_button": "Bagikan Tautan ke Pengguna",
+        "send_message": "Kirim pesan",
+        "share_button": "Bagikan profil",
         "unban_button_room": "Batalkan cekalan dari ruangan",
         "unban_button_space": "Batalkan cekalan dari space",
         "unban_room_confirm_title": "Batalkan cekalan dari %(roomName)s",
         "unban_space_everything": "Batalkan pencekalan dari semuanya yang saya dapat melakukan",
         "unban_space_specific": "Batalkan pencekalan dari beberapa hal yang saya dapat melakukan",
         "unban_space_warning": "Mereka tidak dapat mengakses apa saja yang Anda bukan admin di sana.",
+        "unignore_button": "Batalkan pengabaian",
+        "verification_unavailable": "Verifikasi pengguna tidak tersedia",
         "verify_button": "Verifikasi Pengguna",
         "verify_explainer": "Untuk keamanan lebih, verifikasi pengguna ini dengan memeriksa kode satu kali di kedua perangkat Anda."
     },
     "user_menu": {
+        "link_new_device": "Tautkan perangkat baru",
         "settings": "Semua pengaturan",
         "switch_theme_dark": "Ubah ke mode gelap",
         "switch_theme_light": "Ubah ke mode terang"
@@ -3507,6 +3914,7 @@
         "camera_disabled": "Kamera Anda dimatikan",
         "camera_enabled": "Kamera Anda masih nyala",
         "cannot_call_yourself_description": "Anda tidak dapat melakukan panggilan dengan diri sendiri.",
+        "close_lobby": "Tutup lobi",
         "connecting": "Menghubungkan",
         "connection_lost": "Koneksi ke server telah hilang",
         "connection_lost_description": "Anda tidak dapat membuat panggilan tanpa terhubung ke server.",
@@ -3520,14 +3928,23 @@
         "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",
+        "element_call": "Element Call",
         "enable_camera": "Nyalakan kamera",
         "enable_microphone": "Suarakan mikrofon",
         "expand": "Kembali ke panggilan",
+        "get_call_link": "Bagikan tautan panggilan",
         "hangup": "Akhiri",
         "hide_sidebar_button": "Sembunyikan sisi bilah",
         "input_devices": "Perangkat masukan",
+        "jitsi_call": "Konferensi Jitsi",
         "join_button_tooltip_call_full": "Maaf — panggilan ini saat ini penuh",
+        "legacy_call": "Panggilan Lawas",
         "maximise": "Penuhi layar",
+        "maximise_call": "Maksimalkan panggilan",
+        "metaspace_video_rooms": {
+            "conference_room_section": "Konferensi"
+        },
+        "minimise_call": "Minimalkan panggilan",
         "misconfigured_server": "Panggilan gagal karena servernya tidak dikonfigurasi dengan benar",
         "misconfigured_server_description": "Mohon tanyakan ke administrator homeserver Anda (<code>%(homeserverDomain)s</code>) untuk mengkonfigurasikan server TURN supaya panggilan dapat bekerja dengan benar.",
         "misconfigured_server_fallback": "Secara alternatif, Anda dapat menggunakan server publik di <server/>, tetapi ini tidak akan selalu tersedia, dan akan membagikan alamat IP Anda dengan server itu. Anda juga dapat mengelola ini di Pengaturan.",
@@ -3575,6 +3992,7 @@
         "user_is_presenting": "%(sharerName)s sedang mempresentasi",
         "video_call": "Panggilan video",
         "video_call_started": "Panggilan video dimulai",
+        "video_call_using": "Panggilan video menggunakan:",
         "voice_call": "Panggilan suara",
         "you_are_presenting": "Anda sedang mempresentasi"
     },
@@ -3674,7 +4092,7 @@
         "error_need_to_be_logged_in": "Anda harus masuk.",
         "error_unable_start_audio_stream_description": "Tidak dapat memulai penyiaran audio.",
         "error_unable_start_audio_stream_title": "Gagal untuk memulai siaran langsung",
-        "modal_data_warning": "Data di layar ini dibagikan dengan %(widgetDomain)s",
+        "modal_data_warning": "Data di bawah ini dibagikan dengan %(widgetDomain)s",
         "modal_title_default": "Widget Modal",
         "no_name": "Aplikasi Tidak Diketahui",
         "open_id_permissions_dialog": {
@@ -3683,7 +4101,7 @@
             "title": "Izinkan widget ini untuk memverifikasi identitas Anda"
         },
         "popout": "Widget popout",
-        "set_room_layout": "Tetapkan tata letak ruangan saya untuk semuanya",
+        "set_room_layout": "Tetapkan tata letak untuk semua orang",
         "shared_data_avatar": "URL foto profil Anda",
         "shared_data_device_id": "ID perangkat Anda",
         "shared_data_lang": "Bahasa Anda",
diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
index 29c50b5e35..f57cdf156e 100644
--- a/src/i18n/strings/is.json
+++ b/src/i18n/strings/is.json
@@ -86,7 +86,6 @@
         "react": "Bregðast við",
         "refresh": "Endurlesa",
         "register": "Nýskrá",
-        "reject": "Hafna",
         "remove": "Fjarlægja",
         "rename": "Endurnefna",
         "reply": "Svara",
@@ -369,7 +368,6 @@
         "capabilities": "Geta",
         "copied": "Afritað!",
         "credits": "Framlög",
-        "cross_signing": "Kross-undirritun",
         "dark": "Dökkt",
         "description": "Lýsing",
         "deselect_all": "Afvelja allt",
@@ -675,38 +673,22 @@
     "encryption": {
         "access_secret_storage_dialog": {
             "key_validation_text": {
-                "invalid_security_key": "Ógildur öryggislykill",
-                "recovery_key_is_correct": "Lítur vel út!",
-                "wrong_file_type": "Röng skráartegund",
                 "wrong_security_key": "Rangur öryggislykill"
             },
-            "reset_title": "Frumstilla allt",
             "restoring": "Endurheimti lykla úr öryggisafriti",
-            "security_key_title": "Öryggislykill",
-            "security_phrase_title": "Öryggisfrasi",
-            "separator": "%(securityKey)s eða %(recoveryFile)s",
-            "use_security_key_prompt": "Notaðu öryggislykilinn þinn til að halda áfram."
+            "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_not_ready": "Kross-undirritun er ekki uppsett.",
-        "cross_signing_ready": "Kross-undirritun er tilbúin til notkunar.",
-        "cross_signing_ready_no_backup": "Kross-undirritun er tilbúin en ekki er búið að öryggisafrita dulritunarlykla.",
         "cross_signing_room_normal": "Þessi spjallrás er enda-í-enda dulrituð",
         "cross_signing_room_verified": "Allir á þessari spjallrás eru staðfestir",
         "cross_signing_room_warning": "Einhver er að nota óþekkta setu",
-        "cross_signing_unsupported": "Heimaþjónninn þinn styður ekki kross-undirritun.",
-        "cross_signing_untrusted": "Aðgangurinn þinn er með auðkenni kross-undirritunar í leynigeymslu, en þessu er ekki ennþá treyst í þessari setu.",
         "cross_signing_user_normal": "Þér hefur ekki sannreynt þennan notanda.",
         "cross_signing_user_verified": "Þú hefur sannreynt þennan notanda. Þessi notandi hefur sannreynt öll tæki þeirra.",
         "cross_signing_user_warning": "Þessi notandi hefur ekki sannreynt öll tæki þeirra.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Hreinsa kross-undirritunarlykla",
-            "title": "Eyða kross-undirritunarlyklum?"
-        },
         "event_shield_reason_mismatched_sender_key": "Dulritað meðf ósannreyndu tæki",
         "export_unsupported": "Vafrinn þinn styður ekki nauðsynlegar dulritunarviðbætur",
         "import_invalid_keyfile": "Er ekki gild %(brand)s lykilskrá",
@@ -719,7 +701,6 @@
         "new_recovery_method_detected": {
             "title": "Ný endurheimtuaðferð"
         },
-        "not_supported": "<ekki stutt>",
         "recovery_method_removed": {
             "title": "Endurheimtuaðferð fjarlægð"
         },
@@ -727,8 +708,7 @@
         "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.",
-            "title": "Setja upp"
+            "explainer": "Taktu öryggisafrit af dulritunarlyklunum áður en þú skráir þig út svo þeir tapist ekki."
         },
         "udd": {
             "interactive_verification_button": "Sannprófa gagnvirkt með táknmyndum",
@@ -742,7 +722,6 @@
             "accepting": "Samþykki…",
             "after_new_login": {
                 "device_verified": "Tæki er sannreynt",
-                "reset_confirmation": "Viltu í alvörunni endurstilla sannvottunarlyklana?",
                 "skip_verification": "Sleppa sannvottun í bili",
                 "unable_to_verify": "Tókst ekki að sannreyna þetta tæki",
                 "verify_this_device": "Sannreyna þetta tæki"
@@ -844,10 +823,7 @@
             "title": "Tókst ekki að afrita tengil spjallrásar"
         },
         "error_loading_user_profile": "Gat ekki hlaðið inn notandasniði",
-        "forget_room_failed": "Mistókst að gleyma spjallrásinni %(errCode)s",
-        "search_failed": {
-            "title": "Leit mistókst"
-        }
+        "forget_room_failed": "Mistókst að gleyma spjallrásinni %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1357,11 +1333,6 @@
         "ongoing": "Er að fjarlægja…",
         "reason_label": "Ástæða (valkvætt)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ertu viss um að þú viljir hafna þessu boði?",
-        "failed": "Mistókst að hafna boði",
-        "title": "Hafna boði"
-    },
     "report_content": {
         "description": "Tilkynning um þessi skilaboð mun senda einstakt 'atviksauðkenni' til stjórnanda heimaþjóns. Ef skilaboð í þessari spjallrás eru dulrituð getur stjórnandi heimaþjóns ekki lesið skilaboðatextann eða skoðað skrár eða myndir.",
         "disagree": "Ósammála",
@@ -1482,7 +1453,6 @@
             "user_created": "%(displayName)s bjó til þessa spjallrás.",
             "you_created": "Þú bjóst til þessa spjallrás."
         },
-        "invite_reject_ignore": "Hafna og hunsa notanda",
         "invite_sent_to_email": "Þetta boð var sent til %(email)s",
         "invite_sent_to_email_room": "Þetta boð í %(roomName)s var sent til %(email)s",
         "invite_subtitle": "<userName/> bauð þér",
@@ -1884,7 +1854,6 @@
             "remove_msisdn_prompt": "Fjarlægja %(phone)s?",
             "spell_check_locale_placeholder": "Veldu staðfærslu"
         },
-        "image_thumbnails": "Birta forskoðun/smámyndir fyrir myndir",
         "inline_url_previews_default": "Sjálfgefið virkja forskoðun innfelldra vefslóða",
         "inline_url_previews_room": "Virkja forskoðun vefslóða sjálfgefið fyrir þátttakendur í þessari spjallrás",
         "inline_url_previews_room_account": "Virkja forskoðun vefslóða fyrir þessa spjallrás (einungis fyrir þig)",
@@ -1982,47 +1951,16 @@
         "prompt_invite": "Spyrja áður en boð eru send á mögulega ógild matrix-auðkenni",
         "replace_plain_emoji": "Skipta sjálfkrafa út Emoji-táknum á hreinum texta",
         "security": {
-            "4s_public_key_in_account_data": "í gögnum notandaaðgangs",
-            "4s_public_key_status": "Dreifilykill leynigeymslu:",
-            "backup_key_cached_status": "Öryggisafritunarlykill í skyndiminni:",
-            "backup_key_stored_status": "Geymdur öryggisafritunarlykill:",
-            "backup_key_unexpected_type": "óvænt tegund",
-            "backup_key_well_formed": "rétt sniðið",
-            "backup_keys_description": "Taktu öryggisafrit af dulritunarlyklunum þínum ásamt gögnum notandaaðgangsins fari svo að þú missir aðgang að setunum þínum. Dulritunarlyklarnir verða varðir með einstökum öryggislykli.",
             "bulk_options_accept_all_invites": "Samþykkja alla boðsgesti %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Hafna öllum boðsgestum %(invitedRooms)s",
             "bulk_options_section": "Valkostir magnvinnslu",
-            "cross_signing_cached": "í staðværu skyndiminni",
-            "cross_signing_homeserver_support": "Heimaþjónninn styður eftirfarandi eiginleika:",
-            "cross_signing_homeserver_support_exists": "er til staðar",
-            "cross_signing_in_4s": "í leynigeymslu",
-            "cross_signing_in_memory": "í minni",
-            "cross_signing_master_private_Key": "Aðal-einkalykill:",
-            "cross_signing_not_cached": "fannst ekki á tækinu",
-            "cross_signing_not_found": "fannst ekki",
-            "cross_signing_not_in_4s": "fannst ekki í geymslu",
-            "cross_signing_not_stored": "ekki geymt",
-            "cross_signing_private_keys": "Kross-undirritun einkalykla:",
-            "cross_signing_public_keys": "Kross-undirritun dreifilykla:",
-            "cross_signing_self_signing_private_key": "Sjálf-undirritaður einkalykill:",
-            "cross_signing_user_signing_private_key": "Notanda-undirritaður einkalykill:",
-            "cryptography_section": "Dulritun",
-            "delete_backup": "Eyða öryggisafriti",
-            "delete_backup_confirm_description": "Ertu viss? Þú munt tapa dulrituðu skilaboðunum þínum ef dulritunarlyklarnir þínir eru ekki rétt öryggisafritaðir.",
             "e2ee_default_disabled_warning": "Kerfisstjóri netþjónsins þíns hefur lokað á sjálfvirka dulritun í einkaspjallrásum og beinum skilaboðum.",
             "enable_message_search": "Virka skilaboðleit í dulrituðum spjallrásum",
             "encryption_section": "Dulritun",
-            "error_loading_key_backup_status": "Tókst ekki að hlaða inn stöðu öryggisafritunar dulritunarlykla",
-            "export_megolm_keys": "Flytja út E2E dulritunarlykla spjallrásar",
             "ignore_users_empty": "Þú ert ekki með neina hunsaða notendur.",
             "ignore_users_section": "Hunsaðir notendur",
-            "import_megolm_keys": "Flytja inn E2E dulritunarlykla spjallrásar",
-            "key_backup_active_version_none": "Ekkert",
             "key_backup_algorithm": "Reiknirit:",
-            "key_backup_complete": "Allir lyklar öryggisafritaðir",
             "key_backup_connect": "Tengja þessa setu við öryggisafrit af lykli",
-            "key_backup_inactive": "Þessi seta er <b>ekki að öryggisafrita dulritunarlyklana þína</b>, en þú ert með fyrirliggjandi öryggisafrit sem þú getur endurheimt úr og notað til að halda áfram.",
-            "key_backup_inactive_warning": "Dulritunarlyklarnir þínir eru <b>ekki öryggisafritaðir úr þessari setu</b>.",
             "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": {
@@ -2040,13 +1978,7 @@
             "message_search_sleep_time": "Hve hratt ætti að hlaða niður skilaboðum.",
             "message_search_space_used": "Notað geymslupláss:",
             "message_search_unsupported_web": "%(brand)s nær ekki að setja dulrituð skilaboð leynilega í skyndiminni á tækinu á meðan keyrt er í vafra. Notaðu <desktopLink>%(brand)s Desktop vinnutölvuútgáfuna</desktopLink> svo skilaboðin birtist í leitarniðurstöðum.",
-            "restore_key_backup": "Endurheimta úr öryggisafriti",
-            "secret_storage_not_ready": "ekki tilbúið",
-            "secret_storage_ready": "tilbúið",
-            "secret_storage_status": "Leynigeymsla:",
             "send_analytics": "Senda greiningargögn",
-            "session_id": "Auðkenni setu:",
-            "session_key": "Setulykill:",
             "strict_encryption": "Aldrei senda dulrituð skilaboð af þessu tæki til ósannvottaðra tækja"
         },
         "send_read_receipts": "Senda leskvittanir",
@@ -2239,8 +2171,6 @@
         "topic": "Nær í eða stillir umfjöllunarefni spjallrásar",
         "topic_none": "Þessi spjallrás er ekki með umfjöllunarefni.",
         "topic_room_error": "Mistókst að ná í umfjöllunarefni spjallrásar: Gat ekki fundið spjallrásina (%(roomId)s",
-        "tovirtual": "Skiptir yfir í sýndarspjallrás þessarar spjallrásar, ef hún er til staðar",
-        "tovirtual_not_found": "Engin sýndarspjallrás fyrir þessa spjallrás",
         "unban": "Tekur bann af notanda með uppgefið auðkenni",
         "unflip": "Setur ┬──┬ ノ( ゜-゜ノ) framan við hrein textaskilaboð",
         "unholdcall": "Tekur símtalið í fyrirliggjandi spjallrás úr bið",
@@ -2353,7 +2283,6 @@
         "heading_without_query": "Leita að",
         "join_button_text": "Taka þátt í %(roomAddress)s",
         "keyboard_scroll_hint": "Notaðu <arrows/> til að skruna",
-        "message_search_section_title": "Aðrar leitir",
         "other_rooms_in_space": "Aðrar spjallrásir í %(spaceName)s",
         "public_rooms_label": "Almenningsspjallrásir",
         "recent_searches_section_title": "Nýlegar leitir",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index f1d4029dc9..66ea31ad9c 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -94,7 +94,6 @@
         "react": "Reagisci",
         "refresh": "Aggiorna",
         "register": "Registrati",
-        "reject": "Rifiuta",
         "reload": "Ricarica",
         "remove": "Rimuovi",
         "rename": "Rinomina",
@@ -246,10 +245,10 @@
         "qr_code_login": {
             "completing_setup": "Completamento configurazione nuovo dispositivo",
             "error_rate_limited": "Troppi tentativi in poco tempo. Attendi un po' prima di riprovare.",
-            "error_unexpected": "Si è verificato un errore imprevisto.",
-            "scan_code_instruction": "Scansiona il codice QR sottostante con il dispositivo che è disconnesso.",
-            "scan_qr_code": "Scansiona codice QR",
-            "select_qr_code": "Seleziona '%(scanQRCode)s'",
+            "error_unexpected": "Si è verificato un errore imprevisto. La richiesta di connessione dell'altro dispositivo è stata annullata.",
+            "scan_code_instruction": "Scansiona il codice QR con un altro dispositivo",
+            "scan_qr_code": "Accedi con codice QR",
+            "select_qr_code": "Seleziona \"%(scanQRCode)s\"",
             "waiting_for_device": "In attesa che il dispositivo acceda"
         },
         "register_action": "Crea account",
@@ -428,7 +427,6 @@
         "capabilities": "Capacità",
         "copied": "Copiato!",
         "credits": "Crediti",
-        "cross_signing": "Firma incrociata",
         "dark": "Scuro",
         "description": "Descrizione",
         "deselect_all": "Deseleziona tutti",
@@ -796,44 +794,23 @@
     "empty_room_was_name": "Stanza vuota (era %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Inserisci la tua frase di sicurezza o <button>usa la tua chiave di sicurezza</button> per continuare.",
             "key_validation_text": {
-                "invalid_security_key": "Chiave di sicurezza non valida",
-                "recovery_key_is_correct": "Sembra giusta!",
-                "wrong_file_type": "Tipo di file errato",
                 "wrong_security_key": "Chiave di sicurezza sbagliata"
             },
-            "reset_title": "Reimposta tutto",
-            "reset_warning_1": "Fallo solo se non hai altri dispositivi con cui completare la verifica.",
-            "reset_warning_2": "Se reimposti tutto, ricomincerai senza sessioni fidate, senza utenti fidati e potresti non riuscire a vedere i messaggi passati.",
             "restoring": "Ripristino delle chiavi dal backup",
-            "security_key_title": "Chiave di sicurezza",
-            "security_phrase_incorrect_error": "Impossibile accedere all'archivio segreto. Verifica di avere inserito la password di sicurezza giusta.",
-            "security_phrase_title": "Frase di sicurezza",
-            "separator": "%(securityKey)s o %(recoveryFile)s",
-            "use_security_key_prompt": "Usa la tua chiave di sicurezza per continuare."
+            "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_not_ready": "La firma incrociata non è impostata.",
-        "cross_signing_ready": "La firma incrociata è pronta all'uso.",
-        "cross_signing_ready_no_backup": "La firma incrociata è pronta ma c'è un backup delle chiavi.",
         "cross_signing_room_normal": "Questa stanza è cifrata end-to-end",
         "cross_signing_room_verified": "Tutti in questa stanza sono verificati",
         "cross_signing_room_warning": "Qualcuno sta usando una sessione sconosciuta",
-        "cross_signing_unsupported": "Il tuo homeserver non supporta la firma incrociata.",
-        "cross_signing_untrusted": "Il tuo account ha un'identità a firma incrociata nell'archivio segreto, ma non è ancora fidata da questa sessione.",
         "cross_signing_user_normal": "Non hai verificato questo utente.",
         "cross_signing_user_verified": "Hai verificato questo utente. Questo utente ha verificato tutte le sue sessioni.",
         "cross_signing_user_warning": "Questo utente non ha verificato tutte le sue sessioni.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Elimina chiavi di firma incrociata",
-            "title": "Distruggere le chiavi di firma incrociata?",
-            "warning": "L'eliminazione delle chiavi di firma incrociata è permanente. Chiunque si sia verificato con te vedrà avvisi di sicurezza. Quasi sicuramente non vuoi fare questa cosa, a meno che tu non abbia perso tutti i dispositivi da cui puoi fare l'accesso."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "L'autenticità di questo messaggio crittografato non può essere garantita su questo dispositivo.",
         "event_shield_reason_mismatched_sender_key": "Crittografato da una sessione non verificata",
         "event_shield_reason_unknown_device": "Crittografato da un dispositivo sconosciuto o eliminato.",
@@ -856,7 +833,6 @@
             "title": "Nuovo metodo di recupero",
             "warning": "Se non hai impostato il nuovo metodo di recupero, un aggressore potrebbe tentare di accedere al tuo account. Cambia la password del tuo account e imposta immediatamente un nuovo metodo di recupero nelle impostazioni."
         },
-        "not_supported": "<non supportato>",
         "recovery_method_removed": {
             "description_1": "Questa sessione ha rilevato che la tua password di sicurezza e la chiave per i messaggi sicuri sono state rimosse.",
             "description_2": "Se l'hai fatto accidentalmente, puoi configurare Messaggi Sicuri su questa sessione che cripterà nuovamente la cronologia dei messaggi con un nuovo metodo di recupero.",
@@ -867,8 +843,7 @@
         "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.",
-            "title": "Imposta"
+            "explainer": "Fai una copia delle tue chiavi prima di disconnetterti per evitare di perderle."
         },
         "udd": {
             "interactive_verification_button": "Verifica interattivamente con emoji",
@@ -883,7 +858,6 @@
             "accepting": "Accettazione…",
             "after_new_login": {
                 "device_verified": "Dispositivo verificato",
-                "reset_confirmation": "Reimpostare le chiavi di verifica?",
                 "skip_verification": "Salta la verifica per adesso",
                 "unable_to_verify": "Impossibile verificare questo dispositivo",
                 "verify_this_device": "Verifica questo dispositivo"
@@ -953,8 +927,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_reset_warning_1": "La reimpostazione delle chiavi di verifica non può essere annullata. Dopo averlo fatto, non avrai accesso ai vecchi messaggi cifrati, e gli amici che ti avevano verificato in precedenza vedranno avvisi di sicurezza fino a quando non ti ri-verifichi con loro.",
-            "verify_reset_warning_2": "Procedi solo se sei sicuro di avere perso tutti gli altri tuoi dispositivi e la chiave di sicurezza.",
             "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",
@@ -1020,11 +992,7 @@
             "title": "Impossibile copiare il link della stanza"
         },
         "error_loading_user_profile": "Impossibile caricare il profilo utente",
-        "forget_room_failed": "Impossibile dimenticare la stanza %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Il server potrebbe essere non disponibile, sovraccarico o la ricerca è scaduta :(",
-            "title": "Ricerca fallita"
-        }
+        "forget_room_failed": "Impossibile dimenticare la stanza %(errCode)s"
     },
     "error_user_not_logged_in": "Utente non connesso",
     "event_preview": {
@@ -1640,11 +1608,6 @@
         "ongoing": "Rimozione…",
         "reason_label": "Motivo (facoltativo)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Sei sicuro di volere rifiutare l'invito?",
-        "failed": "Rifiuto dell'invito fallito",
-        "title": "Rifiuta l'invito"
-    },
     "report_content": {
         "description": "La segnalazione di questo messaggio invierà il suo 'ID evento' univoco all'amministratore del tuo homeserver. Se i messaggi della stanza sono cifrati, l'amministratore non potrà leggere il messaggio o vedere file e immagini.",
         "disagree": "Rifiuta",
@@ -1824,7 +1787,6 @@
             "you_created": "Hai creato questa stanza."
         },
         "invite_email_mismatch_suggestion": "Condividi questa email nelle impostazioni per ricevere inviti direttamente in %(brand)s.",
-        "invite_reject_ignore": "Rifiuta e ignora l'utente",
         "invite_sent_to_email": "Questo invito è stato inviato a %(email)s",
         "invite_sent_to_email_room": "Questo invito per %(roomName)s è stato inviato a %(email)s",
         "invite_subtitle": "<userName/> ti ha invitato/a",
@@ -2253,14 +2215,14 @@
             "custom_font_description": "Imposta il nome di un font installato nel tuo sistema e %(brand)s proverà ad usarlo.",
             "custom_font_name": "Nome carattere di sistema",
             "custom_font_size": "Usa dimensione personalizzata",
-            "custom_theme_error_downloading": "Errore scaricando informazioni sul tema.",
+            "custom_theme_error_downloading": "Errore di scaricamento del tema",
             "custom_theme_invalid": "Schema del tema non valido.",
             "font_size": "Dimensione carattere",
             "font_size_default": "%(fontSize)s (predefinito)",
             "image_size_default": "Predefinito",
             "image_size_large": "Grande",
             "layout_bubbles": "Messaggi",
-            "layout_irc": "IRC (Sperimentale)",
+            "layout_irc": "IRC (sperimentale)",
             "match_system_theme": "Usa il tema di sistema",
             "timeline_image_size": "Dimensione immagine nella linea temporale"
         },
@@ -2301,9 +2263,9 @@
             "deactivate_confirm_erase_label": "Nascondi i miei messaggi ai nuovi membri",
             "deactivate_section": "Disattiva l'account",
             "deactivate_warning": "La disattivazione dell'account è permanente - attenzione!",
-            "discovery_email_empty": "Le opzioni di scoperta appariranno dopo aver aggiunto un'email sopra.",
+            "discovery_email_empty": "Le opzioni di scoperta appariranno dopo aver aggiunto un'email.",
             "discovery_email_verification_instructions": "Verifica il link nella tua posta in arrivo",
-            "discovery_msisdn_empty": "Le opzioni di scoperta appariranno dopo aver aggiunto un numero di telefono sopra.",
+            "discovery_msisdn_empty": "Le opzioni di scoperta appariranno dopo aver aggiunto un numero di telefono.",
             "discovery_needs_terms": "Accetta le condizioni di servizio del server di identità (%(serverName)s) per poter essere trovabile tramite indirizzo email o numero di telefono.",
             "email_address_in_use": "Questo indirizzo e-mail è già in uso",
             "email_address_label": "Indirizzo email",
@@ -2329,7 +2291,7 @@
             "error_share_msisdn_discovery": "Impossibile condividere il numero di telefono",
             "identity_server_no_token": "Nessun token di accesso d'identità trovato",
             "identity_server_not_set": "Server d'identità non impostato",
-            "language_section": "Lingua e regione",
+            "language_section": "Lingua",
             "msisdn_in_use": "Questo numero di telefono è già in uso",
             "msisdn_label": "Numero di telefono",
             "msisdn_verification_field_label": "Codice di verifica",
@@ -2342,7 +2304,6 @@
             "remove_msisdn_prompt": "Rimuovere %(phone)s?",
             "spell_check_locale_placeholder": "Scegli una lingua"
         },
-        "image_thumbnails": "Mostra anteprime/miniature per le immagini",
         "inline_url_previews_default": "Attiva le anteprime URL in modo predefinito",
         "inline_url_previews_room": "Attiva le anteprime URL in modo predefinito per i partecipanti in questa stanza",
         "inline_url_previews_room_account": "Attiva le anteprime URL in questa stanza (riguarda solo te)",
@@ -2364,8 +2325,8 @@
                 "enter_phrase_description": "Inserisci una frase di sicurezza che conosci solo tu, dato che è usata per proteggere i tuoi dati. Per sicurezza, non dovresti riutilizzare la password dell'account.",
                 "enter_phrase_title": "Inserisci una frase di sicurezza",
                 "enter_phrase_to_confirm": "Inserisci di nuovo la password di sicurezza per confermarla.",
-                "generate_security_key_description": "Genereremo per te una chiave di sicurezza da conservare in un posto sicuro, come un in gestore di password o in una cassaforte.",
-                "generate_security_key_title": "Genera una chiave di sicurezza",
+                "generate_security_key_description": "Genereremo per te una Chiave di Recupero da conservare in un posto sicuro, come un gestore di password o una cassaforte.",
+                "generate_security_key_title": "Genera una Chiave di Recupero",
                 "pass_phrase_match_failed": "Non corrisponde.",
                 "pass_phrase_match_success": "Corrisponde!",
                 "phrase_strong_enough": "Ottimo! Questa password di sicurezza sembra abbastanza robusta.",
@@ -2478,54 +2439,17 @@
         "prompt_invite": "Chiedi prima di inviare inviti a possibili ID matrix non validi",
         "replace_plain_emoji": "Sostituisci automaticamente le emoji testuali",
         "security": {
-            "4s_public_key_in_account_data": "nei dati dell'account",
-            "4s_public_key_status": "Chiave pubblica dell'archivio segreto:",
             "analytics_description": "Condividi dati anonimi per aiutarci ad identificare i problemi. Niente di personale. Niente terze parti.",
-            "backup_key_cached_status": "Chiave di backup in cache:",
-            "backup_key_stored_status": "Chiave di backup salvata:",
-            "backup_key_unexpected_type": "tipo inatteso",
-            "backup_key_well_formed": "formattata bene",
-            "backup_keys_description": "Fai il backup delle tue chiavi di crittografia con i dati del tuo account in caso perdessi l'accesso alle sessioni. Le tue chiavi saranno protette con una chiave di recupero univoca.",
             "bulk_options_accept_all_invites": "Accetta tutti i %(invitedRooms)s inviti",
             "bulk_options_reject_all_invites": "Rifiuta tutti gli inviti da %(invitedRooms)s",
             "bulk_options_section": "Opzioni generali",
-            "cross_signing_cached": "in cache locale",
-            "cross_signing_homeserver_support": "Funzioni supportate dall'homeserver:",
-            "cross_signing_homeserver_support_exists": "esiste",
-            "cross_signing_in_4s": "in un archivio segreto",
-            "cross_signing_in_memory": "in memoria",
-            "cross_signing_master_private_Key": "Chiave privata principale:",
-            "cross_signing_not_cached": "non trovato in locale",
-            "cross_signing_not_found": "non trovato",
-            "cross_signing_not_in_4s": "non trovato nell'archivio",
-            "cross_signing_not_stored": "non salvato",
-            "cross_signing_private_keys": "Chiavi private di firma incrociata:",
-            "cross_signing_public_keys": "Chiavi pubbliche di firma incrociata:",
-            "cross_signing_self_signing_private_key": "Chiave privata di auto-firma:",
-            "cross_signing_user_signing_private_key": "Chiave privata di firma utente:",
-            "cryptography_section": "Crittografia",
-            "delete_backup": "Elimina backup",
-            "delete_backup_confirm_description": "Sei sicuro? Perderai i tuoi messaggi cifrati se non hai salvato adeguatamente le tue chiavi.",
             "e2ee_default_disabled_warning": "L'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.",
             "enable_message_search": "Attiva la ricerca messaggi nelle stanze cifrate",
             "encryption_section": "Crittografia",
-            "error_loading_key_backup_status": "Impossibile caricare lo stato del backup delle chiavi",
-            "export_megolm_keys": "Esporta chiavi E2E della stanza",
             "ignore_users_empty": "Non hai utenti ignorati.",
             "ignore_users_section": "Utenti ignorati",
-            "import_megolm_keys": "Importa chiavi E2E stanza",
-            "key_backup_active": "Questa sessione sta facendo il backup delle tue chiavi.",
-            "key_backup_active_version": "Versione di backup attiva:",
-            "key_backup_active_version_none": "Nessuno",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_can_be_restored": "Questo backup può essere ripristinato in questa sessione",
-            "key_backup_complete": "Tutte le chiavi sono state copiate",
             "key_backup_connect": "Connetti questa sessione al backup chiavi",
-            "key_backup_connect_prompt": "Connetti questa sessione al backup chiavi prima di disconnetterti per non perdere eventuali chiavi che possono essere solo in questa sessione.",
-            "key_backup_in_progress": "Backup di %(sessionsRemaining)s chiavi…",
-            "key_backup_inactive": "Questa sessione <b>non sta facendo il backup delle tue chiavi</b>, ma hai un backup esistente dal quale puoi ripristinare e che puoi usare da ora in poi.",
-            "key_backup_inactive_warning": "Il backup chiavi <b>non viene fatto per questa sessione</b>.",
-            "key_backup_latest_version": "Ultima versione del backup sul server:",
             "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": {
@@ -2545,13 +2469,7 @@
             "message_search_unsupported": "A %(brand)s mancano alcuni componenti richiesti per tenere in cache i messaggi cifrati in modo sicuro. Se vuoi sperimentare questa funzionalità, compila un %(brand)s Desktop personale con <nativeLink>i componenti di ricerca aggiunti</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s non può tenere in cache i messaggi cifrati quando usato in un browser web. Usa <desktopLink>%(brand)s Desktop</desktopLink> affinché i messaggi cifrati appaiano nei risultati di ricerca.",
             "record_session_details": "Registra il nome, la versione e l'url del client per riconoscere le sessioni più facilmente nel gestore di sessioni",
-            "restore_key_backup": "Ripristina da un backup",
-            "secret_storage_not_ready": "non pronto",
-            "secret_storage_ready": "pronto",
-            "secret_storage_status": "Archivio segreto:",
             "send_analytics": "Invia dati statistici",
-            "session_id": "ID sessione:",
-            "session_key": "Chiave sessione:",
             "strict_encryption": "Non inviare mai messaggi cifrati a sessioni non verificate da questa sessione"
         },
         "send_read_receipts": "Invia le conferme di lettura",
@@ -2622,9 +2540,9 @@
             "security_recommendations_description": "Migliora la sicurezza del tuo account seguendo questi consigli.",
             "session_id": "ID sessione",
             "show_details": "Mostra dettagli",
-            "sign_in_with_qr": "Accedi con codice QR",
+            "sign_in_with_qr": "Collega un nuovo dispositivo",
             "sign_in_with_qr_button": "Mostra codice QR",
-            "sign_in_with_qr_description": "Puoi usare questo dispositivo per accedere in un altro con un codice QR. Dovrai scansionare il codice QR mostrato in questo dispositivo con l'altro.",
+            "sign_in_with_qr_description": "Usa un codice QR per accedere a un altro dispositivo e impostare la messaggistica sicura.",
             "sign_out": "Disconnetti da questa sessione",
             "sign_out_all_other_sessions": "Disconnetti tutte le altre sessioni (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
@@ -2780,8 +2698,6 @@
         "topic": "Ottiene o imposta l'argomento della stanza",
         "topic_none": "Questa stanza non ha un argomento.",
         "topic_room_error": "Lettura argomento stanza fallita: impossibile trovare la stanza (%(roomId)s",
-        "tovirtual": "Passa alla stanza virtuale di questa stanza, se ne ha una",
-        "tovirtual_not_found": "Nessuna stanza virtuale per questa stanza",
         "unban": "Riammette l'utente con l'ID dato",
         "unflip": "Antepone ┬──┬ ノ( ゜-゜ノ) ad un messaggio di testo",
         "unholdcall": "Riprende la chiamata nella stanza attuale",
@@ -2903,7 +2819,6 @@
         "heading_without_query": "Cerca",
         "join_button_text": "Entra in %(roomAddress)s",
         "keyboard_scroll_hint": "Usa <arrows/> per scorrere",
-        "message_search_section_title": "Altre ricerche",
         "other_rooms_in_space": "Altre stanze in %(spaceName)s",
         "public_rooms_label": "Stanze pubbliche",
         "public_spaces_label": "Spazi pubblici",
@@ -2913,7 +2828,6 @@
         "result_may_be_hidden_privacy_warning": "Alcuni risultati potrebbero essere nascosti per privacy",
         "result_may_be_hidden_warning": "Alcuni risultati potrebbero essere nascosti",
         "search_dialog": "Finestra di ricerca",
-        "search_messages_hint": "Per cercare messaggi, trova questa icona in cima ad una stanza <icon/>",
         "spaces_title": "Spazi in cui sei",
         "start_group_chat_button": "Inizia una conversazione di gruppo"
     },
@@ -3737,7 +3651,7 @@
             "title": "Permetti a questo widget di verificare la tua identità"
         },
         "popout": "Oggetto a comparsa",
-        "set_room_layout": "Imposta la disposizione della stanza per tutti",
+        "set_room_layout": "Imposta la disposizione per tutti",
         "shared_data_avatar": "L'URL della tua immagine del profilo",
         "shared_data_device_id": "L'ID del tuo dispositivo",
         "shared_data_lang": "La tua lingua",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 50b2186535..e4e61e8907 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -85,7 +85,6 @@
         "react": "リアクション",
         "refresh": "再読み込み",
         "register": "登録",
-        "reject": "拒否",
         "remove": "削除",
         "rename": "表示名を変更",
         "reply": "返信",
@@ -409,7 +408,6 @@
         "capabilities": "機能",
         "copied": "コピーしました！",
         "credits": "クレジット",
-        "cross_signing": "クロス署名",
         "dark": "ダーク",
         "description": "詳細",
         "deselect_all": "全ての選択を解除",
@@ -755,44 +753,23 @@
     "empty_room_was_name": "空のルーム（以前の名前は%(oldName)s）",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "続行するにはセキュリティーフレーズを入力するか、<button>セキュリティーキーを使用</button>してください。",
             "key_validation_text": {
-                "invalid_security_key": "セキュリティーキーが正しくありません",
-                "recovery_key_is_correct": "問題ありません！",
-                "wrong_file_type": "正しくないファイルの種類",
                 "wrong_security_key": "正しくないセキュリティーキー"
             },
-            "reset_title": "全てリセット",
-            "reset_warning_1": "認証を行える端末がない場合のみ行ってください。",
-            "reset_warning_2": "全てをリセットすると、履歴とメッセージが消去され、信頼済の端末、信頼済のユーザーが取り消されます。また、過去のメッセージを表示できなくなる可能性があります。",
             "restoring": "バックアップから鍵を復元",
-            "security_key_title": "セキュリティーキー",
-            "security_phrase_incorrect_error": "機密ストレージにアクセスできません。正しいセキュリティーフレーズを入力したことを確認してください。",
-            "security_phrase_title": "セキュリティーフレーズ",
-            "separator": "%(securityKey)sまたは%(recoveryFile)s",
-            "use_security_key_prompt": "続行するにはセキュリティーキーを使用してください。"
+            "security_key_title": "セキュリティーキー"
         },
         "bootstrap_title": "鍵のセットアップ",
         "cancel_entering_passphrase_description": "パスフレーズの入力をキャンセルしてよろしいですか？",
         "cancel_entering_passphrase_title": "パスフレーズの入力をキャンセルしますか？",
         "confirm_encryption_setup_body": "以下のボタンをクリックして、暗号化の設定を承認してください。",
         "confirm_encryption_setup_title": "暗号化の設定を承認してください",
-        "cross_signing_not_ready": "クロス署名が設定されていません。",
-        "cross_signing_ready": "クロス署名の使用準備が完了しました。",
-        "cross_signing_ready_no_backup": "クロス署名は準備できましたが、鍵はバックアップされていません。",
         "cross_signing_room_normal": "このルームはエンドツーエンドで暗号化されています",
         "cross_signing_room_verified": "このルーム内の全員を認証済",
         "cross_signing_room_warning": "誰かが不明なセッションを使用しています",
-        "cross_signing_unsupported": "あなたのホームサーバーはクロス署名に対応していません。",
-        "cross_signing_untrusted": "あなたのアカウントではクロス署名の認証情報が機密ストレージに保存されていますが、このセッションでは信頼されていません。",
         "cross_signing_user_normal": "あなたはこのユーザーを認証していません。",
         "cross_signing_user_verified": "このユーザーを認証しました。このユーザーは全てのセッションを認証しました。",
         "cross_signing_user_warning": "このユーザーは全てのセッションを確認していません。",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "クロス署名鍵を削除",
-            "title": "クロス署名鍵を破棄してよろしいですか？",
-            "warning": "クロス署名鍵の削除は取り消せません。認証した相手には、セキュリティーに関する警告が表示されます。クロス署名を行える全ての端末を失ったのでない限り、続行すべきではありません。"
-        },
         "event_shield_reason_authenticity_not_guaranteed": "この暗号化されたメッセージの真正性はこの端末では保証できません。",
         "event_shield_reason_mismatched_sender_key": "未認証のセッションによる暗号化",
         "export_unsupported": "お使いのブラウザーは、必要な暗号化拡張機能をサポートしていません",
@@ -812,7 +789,6 @@
             "title": "新しい復元方法",
             "warning": "新しい復元方法を設定しなかった場合、攻撃者がアカウントへアクセスしようとしている可能性があります。設定画面ですぐにアカウントのパスワードを変更し、新しい復元方法を設定してください。"
         },
-        "not_supported": "<サポート対象外>",
         "recovery_method_removed": {
             "description_1": "セキュリティーフレーズと、セキュアメッセージの鍵が削除されました。",
             "description_2": "偶然削除してしまった場合は、このセッションで、メッセージの暗号化を設定することができます。設定すると、新しい復元方法でセッションのデータを改めて暗号化します。",
@@ -823,8 +799,7 @@
         "set_up_toast_description": "暗号化されたメッセージとデータへのアクセスが失われるのを防ぎましょう",
         "set_up_toast_title": "セキュアバックアップを設定",
         "setup_secure_backup": {
-            "explainer": "鍵を失くさないよう、サインアウトする前にバックアップしてください。",
-            "title": "設定"
+            "explainer": "鍵を失くさないよう、サインアウトする前にバックアップしてください。"
         },
         "udd": {
             "interactive_verification_button": "絵文字で認証",
@@ -839,7 +814,6 @@
             "accepting": "承認しています…",
             "after_new_login": {
                 "device_verified": "端末が認証されました",
-                "reset_confirmation": "本当に認証鍵をリセットしますか？",
                 "skip_verification": "認証をスキップ",
                 "unable_to_verify": "この端末を認証できません",
                 "verify_this_device": "この端末を認証"
@@ -906,8 +880,6 @@
             "verify_emoji_prompt": "絵文字の並びを比較して認証。",
             "verify_emoji_prompt_qr": "上記のコードをスキャンできない場合は、絵文字による確認を行ってください。",
             "verify_later": "後で認証",
-            "verify_reset_warning_1": "認証鍵のリセットは取り消せません。リセットすると、以前の暗号化されたメッセージにはアクセスできなくなります。また、あなたのアカウントを認証した連絡先には、再認証するまで、セキュリティーに関する警告が表示されます。",
-            "verify_reset_warning_2": "全ての端末とセキュリティーキーを紛失してしまったことが確かである場合にのみ、続行してください。",
             "verify_using_device": "別の端末で認証",
             "verify_using_key": "セキュリティーキーで認証",
             "verify_using_key_or_phrase": "セキュリティーキーあるいはセキュリティーフレーズで認証",
@@ -963,11 +935,7 @@
             "title": "ルームのリンクをコピーできません"
         },
         "error_loading_user_profile": "ユーザーのプロフィールを読み込めませんでした",
-        "forget_room_failed": "ルームの履歴を消去するのに失敗しました %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "サーバーが使用できないか、オーバーロードしているか、または検索がタイムアウトした可能性があります :(",
-            "title": "検索に失敗しました"
-        }
+        "forget_room_failed": "ルームの履歴を消去するのに失敗しました %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1525,11 +1493,6 @@
         "ongoing": "削除しています…",
         "reason_label": "理由（任意）"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "招待を辞退してよろしいですか？",
-        "failed": "招待を辞退できませんでした",
-        "title": "招待を辞退"
-    },
     "report_content": {
         "description": "このメッセージを報告すると、このメッセージの一意の「イベントID」があなたのホームサーバーの管理者に送信されます。このルーム内のメッセージが暗号化されている場合、ホームサーバーの管理者はメッセージのテキストを読んだり、ファイルや画像を表示したりすることはできません。",
         "disagree": "同意しない",
@@ -1667,7 +1630,6 @@
             "you_created": "このルームを作成しました。"
         },
         "invite_email_mismatch_suggestion": "このメールアドレスを設定から共有すると、%(brand)sから招待を受け取れます。",
-        "invite_reject_ignore": "拒否した上で、このユーザーを無視",
         "invite_sent_to_email": "招待が%(email)sに送信されました",
         "invite_sent_to_email_room": "ルーム %(roomName)sへの招待がメールアドレス %(email)s へ送信されました",
         "invite_subtitle": "<userName/>があなたを招待しています",
@@ -2137,7 +2099,6 @@
             "remove_msisdn_prompt": "%(phone)sを削除しますか？",
             "spell_check_locale_placeholder": "ロケールを選択"
         },
-        "image_thumbnails": "画像のプレビューまたはサムネイルを表示",
         "inline_url_previews_default": "既定でインラインURLプレビューを有効にする",
         "inline_url_previews_room": "このルームの参加者のために既定でURLプレビューを有効にする",
         "inline_url_previews_room_account": "このルームのURLプレビューを有効にする（あなたにのみ適用）",
@@ -2243,50 +2204,16 @@
         "prompt_invite": "不正の可能性があるMatrix IDに招待を送信する前に確認",
         "replace_plain_emoji": "自動的にプレーンテキストの絵文字を置き換える",
         "security": {
-            "4s_public_key_in_account_data": "アカウントデータ内",
-            "4s_public_key_status": "機密ストレージの公開鍵：",
-            "backup_key_cached_status": "バックアップキーのキャッシュ：",
-            "backup_key_stored_status": "バックアップキーの保存：",
-            "backup_key_unexpected_type": "予期しない種類",
-            "backup_key_well_formed": "正常な形式です",
-            "backup_keys_description": "セッションにアクセスできなくなる場合に備えて、アカウントデータと暗号鍵をバックアップしましょう。鍵は一意のセキュリティーキーで保護されます。",
             "bulk_options_accept_all_invites": "%(invitedRooms)sの全ての招待を承認",
             "bulk_options_reject_all_invites": "%(invitedRooms)sの全ての招待を拒否",
             "bulk_options_section": "一括オプション",
-            "cross_signing_cached": "ローカルでキャッシュ",
-            "cross_signing_homeserver_support": "ホームサーバーの対応状況：",
-            "cross_signing_homeserver_support_exists": "対応",
-            "cross_signing_in_4s": "機密ストレージ内",
-            "cross_signing_in_memory": "メモリー内",
-            "cross_signing_master_private_Key": "マスター秘密鍵：",
-            "cross_signing_not_cached": "ローカルにありません",
-            "cross_signing_not_found": "ありません",
-            "cross_signing_not_in_4s": "ストレージ内にありません",
-            "cross_signing_not_stored": "保存されていません",
-            "cross_signing_private_keys": "クロス署名の秘密鍵：",
-            "cross_signing_public_keys": "クロス署名の公開鍵：",
-            "cross_signing_self_signing_private_key": "自己署名の秘密鍵：",
-            "cross_signing_user_signing_private_key": "ユーザー署名の秘密鍵：",
-            "cryptography_section": "暗号",
-            "delete_backup": "バックアップを削除",
-            "delete_backup_confirm_description": "本当によろしいですか？ もし鍵が正常にバックアップされていない場合、暗号化されたメッセージにアクセスできなくなります。",
             "e2ee_default_disabled_warning": "サーバー管理者は、非公開のルームとダイレクトメッセージで既定でエンドツーエンド暗号化を無効にしています。",
             "enable_message_search": "暗号化されたルームでメッセージの検索を有効にする",
             "encryption_section": "暗号化",
-            "error_loading_key_backup_status": "鍵のバックアップの状態を読み込めません",
-            "export_megolm_keys": "ルームのエンドツーエンド暗号鍵をエクスポート",
             "ignore_users_empty": "無視しているユーザーはいません。",
             "ignore_users_section": "無視しているユーザー",
-            "import_megolm_keys": "ルームのエンドツーエンド暗号鍵をインポート",
-            "key_backup_active": "このセッションは鍵をバックアップしています。",
-            "key_backup_active_version_none": "なし",
             "key_backup_algorithm": "アルゴリズム：",
-            "key_backup_complete": "全ての鍵がバックアップされています",
             "key_backup_connect": "このセッションを鍵のバックアップに接続",
-            "key_backup_connect_prompt": "サインアウトする前に、このセッションにだけある鍵を失わないよう、セッションを鍵のバックアップに接続しましょう。",
-            "key_backup_in_progress": "%(sessionsRemaining)s個の鍵をバックアップしています…",
-            "key_backup_inactive": "このセッションでは<b>鍵をバックアップしていません</b>が、復元に使用したり、今後鍵を追加したりできるバックアップがあります。",
-            "key_backup_inactive_warning": "鍵は<b>このセッションからバックアップされていません</b>。",
             "message_search_disable_warning": "無効にすると、暗号化されたルームのメッセージは検索結果に表示されません。",
             "message_search_disabled": "検索結果の表示用に、暗号化されたメッセージをローカルに安全にキャッシュしています。",
             "message_search_enabled": {
@@ -2306,13 +2233,7 @@
             "message_search_unsupported": "暗号化されたメッセージの安全なキャッシュをローカルに保存するためのコンポーネントが%(brand)sにありません。この機能を試してみたい場合は、<nativeLink>検索コンポーネントが追加された</nativeLink>%(brand)sデスクトップのカスタム版をビルドしてください。",
             "message_search_unsupported_web": "Webブラウザー上で動作する%(brand)sは、暗号化メッセージの安全なキャッシュをローカルに保存できません。<desktopLink>%(brand)s デスクトップ</desktopLink>を使用すると、暗号化メッセージを検索結果に表示することができます。",
             "record_session_details": "クライアントの名称、バージョン、URLを記録し、セッションマネージャーでより容易にセッションを認識できるよう設定",
-            "restore_key_backup": "バックアップから復元",
-            "secret_storage_not_ready": "準備ができていません",
-            "secret_storage_ready": "準備ができました",
-            "secret_storage_status": "機密ストレージ：",
             "send_analytics": "分析データを送信",
-            "session_id": "セッションID：",
-            "session_key": "セッションキー：",
             "strict_encryption": "このセッションでは、未認証のセッションに対して暗号化されたメッセージを送信しない"
         },
         "send_read_receipts": "開封確認メッセージを送信",
@@ -2527,8 +2448,6 @@
         "topic": "ルームのトピックを取得または設定",
         "topic_none": "このルームにはトピックがありません。",
         "topic_room_error": "ルームのトピックの取得に失敗しました：ルームを発見できません（%(roomId)s）",
-        "tovirtual": "このルームのバーチャルルームに移動（あれば）",
-        "tovirtual_not_found": "このルームのバーチャルルームはありません",
         "unban": "指定したIDのユーザーのブロックを解除",
         "unflip": "プレーンテキストメッセージの前に ┬──┬ ノ( ゜-゜ノ) を付ける",
         "unholdcall": "現在のルームの通話を保留から外す",
@@ -2647,7 +2566,6 @@
         "heading_without_query": "検索",
         "join_button_text": "%(roomAddress)sに参加",
         "keyboard_scroll_hint": "<arrows/>でスクロール",
-        "message_search_section_title": "その他の検索",
         "other_rooms_in_space": "%(spaceName)sの他のルーム",
         "public_rooms_label": "公開ルーム",
         "recent_searches_section_title": "最近の検索",
@@ -2656,7 +2574,6 @@
         "result_may_be_hidden_privacy_warning": "プライバシーの観点から表示していない結果があります",
         "result_may_be_hidden_warning": "いくつかの結果が表示されていない可能性があります",
         "search_dialog": "検索ダイアログ",
-        "search_messages_hint": "メッセージを検索する場合は、ルームの上に表示されるアイコン<icon/>をクリックしてください。",
         "spaces_title": "参加しているスペース",
         "start_group_chat_button": "グループチャットを開始"
     },
diff --git a/src/i18n/strings/ka.json b/src/i18n/strings/ka.json
index b590710b45..514e069bfa 100644
--- a/src/i18n/strings/ka.json
+++ b/src/i18n/strings/ka.json
@@ -75,7 +75,6 @@
         "react": "რეაგირება",
         "refresh": "განახლება",
         "register": "რეგისტრაცია",
-        "reject": "უარყოფა",
         "reload": "განაახლეთ",
         "remove": "წაშლა",
         "rename": "გადარქმევა",
@@ -389,7 +388,6 @@
         "capabilities": "შესაძლებლობები",
         "copied": "დაკოპირებულია!",
         "credits": "კრედიტები",
-        "cross_signing": "ჯვარედინი ხელმოწერა",
         "dark": "მუქი",
         "description": "აღწერა",
         "deselect_all": "Გააუქმეთ ყველა მონიშვნა",
@@ -660,44 +658,23 @@
     "empty_room_was_name": "ცარიელი ოთახი (იყო%(oldName)s )",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "შეიყვანეთ თქვენი უსაფრთხოების ფრაზა ან<button> გამოიყენეთ თქვენი უსაფრთხოების გასაღები</button> გააგრძელოს.",
             "key_validation_text": {
-                "invalid_security_key": "უსაფრთხოების გასაღები არასწორია",
-                "recovery_key_is_correct": "კარგად გამოიყურება!",
-                "wrong_file_type": "არასწორი ფაილის ტიპი",
                 "wrong_security_key": "არასწორი უსაფრთხოების გასაღები"
             },
-            "reset_title": "გადააყენე ყველაფერი",
-            "reset_warning_1": "გააკეთეთ ეს მხოლოდ იმ შემთხვევაში, თუ სხვა მოწყობილობა არ გაქვთ დადასტურების დასასრულებლად.",
-            "reset_warning_2": "თუ ყველაფერს გადატვირთავთ, გადატვირთავთ სანდო სესიების გარეშე, სანდო მომხმარებლების გარეშე და შესაძლოა ვერ დაინახოთ წარსული შეტყობინებები.",
             "restoring": "გასაღებების აღდგენა სარეზერვო ასლიდან",
-            "security_key_title": "უსაფრთხოების გასაღები",
-            "security_phrase_incorrect_error": "საიდუმლო მეხსიერებაზე წვდომა შეუძლებელია. გთხოვთ, დაადასტუროთ, რომ შეიყვანეთ უსაფრთხოების სწორი ფრაზა.",
-            "security_phrase_title": "უსაფრთხოების ფრაზა",
-            "separator": "%(securityKey)sან%(recoveryFile)s",
-            "use_security_key_prompt": "გამოიყენეთ თქვენი უსაფრთხოების გასაღები გასაგრძელებლად."
+            "security_key_title": "უსაფრთხოების გასაღები"
         },
         "bootstrap_title": "გასაღებების დაყენება",
         "cancel_entering_passphrase_description": "დარწმუნებული ხართ, რომ გსურთ გააუქმოთ პაროლის შეყვანა?",
         "cancel_entering_passphrase_title": "გააუქმოს პაროლის შეყვანა?",
         "confirm_encryption_setup_body": "დააწკაპუნეთ ქვემოთ მოცემულ ღილაკზე დაშიფვრის დაყენების დასადასტურებლად.",
         "confirm_encryption_setup_title": "დაადასტურეთ დაშიფვრის დაყენება",
-        "cross_signing_not_ready": "ჯვარედინი ხელმოწერა არ არის დაყენებული.",
-        "cross_signing_ready": "ჯვარედინი ხელმოწერა მზად არის გამოსაყენებლად.",
-        "cross_signing_ready_no_backup": "ჯვარედინი ხელმოწერა მზად არის, მაგრამ გასაღებების სარეზერვო ასლი არ არის შექმნილი.",
         "cross_signing_room_normal": "",
         "cross_signing_room_verified": "ამ ოთახში ყველა დამოწმებულია",
         "cross_signing_room_warning": "ვიღაც უცნობ სესიას იყენებს",
-        "cross_signing_unsupported": "თქვენი სახლის სერვერი არ უჭერს მხარს ჯვარედინი ხელმოწერას.",
-        "cross_signing_untrusted": "თქვენს ანგარიშს აქვს ჯვარედინი ხელმოწერის იდენტიფიკაცია საიდუმლო საცავში, მაგრამ მას ჯერ არ ენდობა ეს სესია.",
         "cross_signing_user_normal": "თქვენ არ დაადასტურეთ ეს მომხმარებელი.",
         "cross_signing_user_verified": "თქვენ დაადასტურეთ ეს მომხმარებელი. ამ მომხმარებელმა დაადასტურა ყველა მათი სესია.",
         "cross_signing_user_warning": "ამ მომხმარებელს არ დაუდასტურებია ყველა მათი სესია.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "ჯვარედინი ხელმოწერის გასაღებების გასუფთავება",
-            "title": "გაანადგურე ჯვარედინი ხელმოწერის გასაღებები?",
-            "warning": "ჯვარედინი ხელმოწერის გასაღებების წაშლა მუდმივია. ნებისმიერი, ვისთანაც დამოწმებული ხართ, დაინახავს უსაფრთხოების გაფრთხილებებს. თქვენ, რა თქმა უნდა, არ გსურთ ამის გაკეთება, თუ არ დაკარგეთ ყველა მოწყობილობა, საიდანაც შეგიძლიათ ჯვარედინი ხელმოწერა."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "ამ დაშიფრული შეტყობინების ავთენტურობის გარანტია შეუძლებელია ამ მოწყობილობაზე.",
         "event_shield_reason_mismatched_sender_key": "დაშიფრულია დაუდასტურებელი სესიით",
         "event_shield_reason_unknown_device": "დაშიფრულია უცნობი ან წაშლილი მოწყობილობით.",
@@ -720,7 +697,6 @@
             "title": "აღდგენის ახალი მეთოდი",
             "warning": "თუ თქვენ არ დააყენეთ აღდგენის ახალი მეთოდი, შესაძლოა თავდამსხმელი ცდილობდეს თქვენს ანგარიშზე წვდომას. შეცვალეთ თქვენი ანგარიშის პაროლი და დააყენეთ აღდგენის ახალი მეთოდი დაუყოვნებლივ პარამეტრებში."
         },
-        "not_supported": "<not supported>",
         "recovery_method_removed": {
             "description_1": "ამ სესიამ დაადგინა, რომ თქვენი უსაფრთხოების ფრაზა და Secure Messages გასაღები წაიშალა.",
             "description_2": "თუ ეს შემთხვევით გააკეთეთ, შეგიძლიათ დააყენოთ Secure Messages ამ სესიაზე, რომელიც ხელახლა დაშიფვრავს ამ სესიის შეტყობინებების ისტორიას აღდგენის ახალი მეთოდით.",
@@ -731,8 +707,7 @@
         "set_up_toast_description": "დაიცავით დაშიფრულ შეტყობინებებსა და მონაცემებზე წვდომის დაკარგვისგან",
         "set_up_toast_title": "დააყენეთ უსაფრთხო სარეზერვო ასლი",
         "setup_secure_backup": {
-            "explainer": "შექმენით თქვენი გასაღებების სარეზერვო ასლები გასვლამდე, რათა არ დაკარგოთ ისინი.",
-            "title": "დაყენება"
+            "explainer": "შექმენით თქვენი გასაღებების სარეზერვო ასლები გასვლამდე, რათა არ დაკარგოთ ისინი."
         },
         "udd": {
             "interactive_verification_button": "ინტერაქტიულად გადაამოწმეთ emoji-ით",
@@ -747,7 +722,6 @@
             "accepting": "მიღება…",
             "after_new_login": {
                 "device_verified": "მოწყობილობა დადასტურებულია",
-                "reset_confirmation": "ნამდვილად გადააყენეთ დადასტურების გასაღებები?",
                 "skip_verification": "ამ დროისთვის გამოტოვეთ დადასტურება",
                 "unable_to_verify": "ამ მოწყობილობის დადასტურება შეუძლებელია",
                 "verify_this_device": "დაადასტურეთ ეს მოწყობილობა"
@@ -817,8 +791,6 @@
             "verify_emoji_prompt": "გადაამოწმეთ უნიკალური emoji-ების შედარებით.",
             "verify_emoji_prompt_qr": "თუ ზემოთ მოცემულ კოდს ვერ სკანირებთ, გადაამოწმეთ უნიკალური emoji-ების შედარებით.",
             "verify_later": "მოგვიანებით გადავამოწმებ",
-            "verify_reset_warning_1": "თქვენი დამადასტურებელი გასაღებების გადაყენება შეუძლებელია. გადატვირთვის შემდეგ, თქვენ არ გექნებათ წვდომა ძველ დაშიფრულ შეტყობინებებზე და ყველა მეგობარი, ვინც ადრე დაგიდასტურდათ, დაინახავს უსაფრთხოების გაფრთხილებებს, სანამ მათთან ხელახლა გადაამოწმებთ.",
-            "verify_reset_warning_2": "გთხოვთ გააგრძელოთ მხოლოდ იმ შემთხვევაში, თუ დარწმუნებული ხართ, რომ დაკარგეთ ყველა თქვენი სხვა მოწყობილობა და უსაფრთხოების გასაღები.",
             "verify_using_device": "გადაამოწმეთ სხვა მოწყობილობით",
             "verify_using_key": "გადაამოწმეთ უსაფრთხოების გასაღებით",
             "verify_using_key_or_phrase": "გადაამოწმეთ უსაფრთხოების გასაღებით ან ფრაზით",
@@ -1325,7 +1297,6 @@
             "you_created": "თქვენ შექმენით ეს ოთახი."
         },
         "invite_email_mismatch_suggestion": "გააზიარეთ ეს ელფოსტა პარამეტრებში, რათა პირდაპირ მიიღოთ მოწვევები%(brand)s .",
-        "invite_reject_ignore": "მომხმარებლის უარყოფა და იგნორირება",
         "invite_sent_to_email": "ეს მოწვევა გაიგზავნა%(email)s",
         "invite_sent_to_email_room": "ეს მოწვევა%(roomName)s გაგზავნეს%(email)s",
         "invite_subtitle": "მოწვეული<userName/>",
@@ -1770,7 +1741,6 @@
             "remove_msisdn_prompt": "ამოღება%(phone)s ?",
             "spell_check_locale_placeholder": "აირჩიეთ ლოკალი"
         },
-        "image_thumbnails": "სურათების გადახედვის/მინიატურების ჩვენება",
         "inline_url_previews_default": "ნაგულისხმევად ჩართული URL-ის გადახედვის ჩართვა",
         "inline_url_previews_room": "URL-ის გადახედვის ჩართვა ნაგულისხმევად ამ ოთახში მონაწილეებისთვის",
         "inline_url_previews_room_account": "ამ ოთახისთვის URL-ის გადახედვის ჩართვა (მხოლოდ თქვენზე მოქმედებს)",
@@ -1906,54 +1876,17 @@
         "prompt_invite": "მოითხოვეთ მოწვევის გაგზავნამდე პოტენციურად არასწორი matrix ID-ებზე",
         "replace_plain_emoji": "ავტომატური ჩანაცვლება უბრალო ტექსტური Emoji",
         "security": {
-            "4s_public_key_in_account_data": "ანგარიშის მონაცემებში",
-            "4s_public_key_status": "საიდუმლო შენახვის საჯარო გასაღები:",
             "analytics_description": "გააზიარეთ ანონიმური მონაცემები, რათა დაგვეხმაროთ პრობლემების იდენტიფიცირებაში. არაფერი პირადული. არ არის მესამე მხარე.",
-            "backup_key_cached_status": "სარეზერვო გასაღები შენახულია:",
-            "backup_key_stored_status": "შენახულია სარეზერვო გასაღები:",
-            "backup_key_unexpected_type": "მოულოდნელი ტიპი",
-            "backup_key_well_formed": "კარგად ჩამოყალიბებული",
-            "backup_keys_description": "შექმენით თქვენი დაშიფვრის გასაღებების სარეზერვო ასლები თქვენი ანგარიშის მონაცემებით, თუ დაკარგავთ წვდომას თქვენს სესიებზე. თქვენი გასაღებები დაცული იქნება უსაფრთხოების უნიკალური გასაღებით.",
             "bulk_options_accept_all_invites": "მიიღე ყველა%(invitedRooms)s იწვევს",
             "bulk_options_reject_all_invites": "უარყოთ ყველა%(invitedRooms)s იწვევს",
             "bulk_options_section": "ნაყარი ვარიანტები",
-            "cross_signing_cached": "ადგილობრივად ქეშირებული",
-            "cross_signing_homeserver_support": "Homeserver-ის ფუნქციების მხარდაჭერა:",
-            "cross_signing_homeserver_support_exists": "არსებობს",
-            "cross_signing_in_4s": "საიდუმლო საცავში",
-            "cross_signing_in_memory": "მეხსიერებაში",
-            "cross_signing_master_private_Key": "ძირითადი პირადი გასაღები:",
-            "cross_signing_not_cached": "ადგილობრივად არ არის ნაპოვნი",
-            "cross_signing_not_found": "არ მოიძებნა",
-            "cross_signing_not_in_4s": "არ არის ნაპოვნი საცავში",
-            "cross_signing_not_stored": "არ ინახება",
-            "cross_signing_private_keys": "პირადი გასაღებების ჯვარედინი ხელმოწერა:",
-            "cross_signing_public_keys": "საჯარო გასაღებების ჯვარედინი ხელმოწერა:",
-            "cross_signing_self_signing_private_key": "პირადი გასაღების თვითმოწერა:",
-            "cross_signing_user_signing_private_key": "მომხმარებლის ხელმოწერის პირადი გასაღები:",
-            "cryptography_section": "კრიპტოგრაფია",
-            "delete_backup": "სარეზერვო ასლის წაშლა",
-            "delete_backup_confirm_description": "დარწმუნებული ხარ? თქვენ დაკარგავთ დაშიფრულ შეტყობინებებს, თუ თქვენი გასაღებების სარეზერვო ასლი სწორად არ არის შექმნილი.",
             "e2ee_default_disabled_warning": "თქვენმა სერვერის ადმინისტრატორმა ნაგულისხმევად გათიშული დაშიფვრა პირად ოთახებში და პირდაპირ შეტყობინებებში.",
             "enable_message_search": "ჩართეთ შეტყობინებების ძებნა დაშიფრულ ოთახებში",
             "encryption_section": "დაშიფვრა",
-            "error_loading_key_backup_status": "გასაღების სარეზერვო სტატუსის ჩატვირთვა შეუძლებელია",
-            "export_megolm_keys": "E2E ოთახის გასაღებების ექსპორტი",
             "ignore_users_empty": "თქვენ არ გყავთ უგულებელყოფილი მომხმარებლები.",
             "ignore_users_section": "იგნორირებული მომხმარებლები",
-            "import_megolm_keys": "E2E ოთახის გასაღებების იმპორტი",
-            "key_backup_active": "ამ სესიაზე ხდება თქვენი გასაღებების სარეზერვო ასლი.",
-            "key_backup_active_version": "აქტიური სარეზერვო ვერსია:",
-            "key_backup_active_version_none": "არცერთი",
             "key_backup_algorithm": "ალგორითმი:",
-            "key_backup_can_be_restored": "ამ სესიაზე შესაძლებელია ამ სარეზერვო ასლის აღდგენა",
-            "key_backup_complete": "ყველა გასაღების სარეზერვო ასლი შეიქმნა",
             "key_backup_connect": "დააკავშირეთ ეს სესია Key Backup-თან",
-            "key_backup_connect_prompt": "შეაერთეთ ეს სესია გასაღების სარეზერვო სისტემასთან გასვლამდე, რათა თავიდან აიცილოთ კლავიშების დაკარგვა, რომელიც შეიძლება იყოს მხოლოდ ამ სესიაზე.",
-            "key_backup_in_progress": "სარეზერვო ასლის შექმნა%(sessionsRemaining)s გასაღებები…",
-            "key_backup_inactive": "ეს სესია არის<b> არ არის თქვენი გასაღებების სარეზერვო ასლი</b> , მაგრამ თქვენ გაქვთ არსებული სარეზერვო ასლი, საიდანაც შეგიძლიათ აღადგინოთ და დაამატოთ შემდგომში.",
-            "key_backup_inactive_warning": "შენი გასაღებებია<b> არ ხდება ამ სესიიდან სარეზერვო ასლის შექმნა</b> .",
-            "key_backup_latest_version": "უახლესი სარეზერვო ვერსია სერვერზე:",
             "message_search_disable_warning": "თუ გამორთულია, დაშიფრული ოთახებიდან შეტყობინებები არ გამოჩნდება ძიების შედეგებში.",
             "message_search_disabled": "დაშიფრული შეტყობინებების ლოკალურად დაშიფვრა, რათა გამოჩნდეს ძიების შედეგებში.",
             "message_search_enabled": {
@@ -1973,13 +1906,7 @@
             "message_search_unsupported": "%(brand)sაკლია ზოგიერთი კომპონენტი, რომელიც საჭიროა დაშიფრული შეტყობინებების ადგილობრივად უსაფრთხოდ შესანახად. თუ გსურთ ამ ფუნქციის ექსპერიმენტი, შექმენით საბაჟო%(brand)s დესკტოპი ერთად<nativeLink> დამატებულია საძიებო კომპონენტები</nativeLink> .",
             "message_search_unsupported_web": "%(brand)sარ შეუძლია დაშიფრული შეტყობინებების ლოკალურად დაშიფვრა ვებ-ბრაუზერში მუშაობისას. გამოყენება<desktopLink>%(brand)s სამუშაო მაგიდა</desktopLink> დაშიფრული შეტყობინებების გამოსაჩენად ძიების შედეგებში.",
             "record_session_details": "ჩაწერეთ კლიენტის სახელი, ვერსია და url, რათა უფრო ადვილად ამოიცნოთ სესიები სესიების მენეჯერში",
-            "restore_key_backup": "აღდგენა სარეზერვოდან",
-            "secret_storage_not_ready": "არ არის მზად",
-            "secret_storage_ready": "მზადაა",
-            "secret_storage_status": "საიდუმლო შენახვა:",
             "send_analytics": "ანალიტიკის მონაცემების გაგზავნა",
-            "session_id": "სესიის ID:",
-            "session_key": "სესიის გასაღები:",
             "strict_encryption": "არასოდეს გაუგზავნოთ დაშიფრული შეტყობინებები დაუდასტურებელ სესიებზე ამ სესიიდან"
         },
         "send_read_receipts": "გაგზავნეთ წაკითხული ქვითრები",
@@ -2201,8 +2128,6 @@
         "topic": "იღებს ან ადგენს ოთახის თემას",
         "topic_none": "ამ ოთახს თემა არ აქვს.",
         "topic_room_error": "ოთახის თემის მიღება ვერ მოხერხდა: ოთახის პოვნა ვერ ხერხდება (%(roomId)s",
-        "tovirtual": "გადადის ამ ოთახის ვირტუალურ ოთახში, თუ მას აქვს",
-        "tovirtual_not_found": "ამ ოთახისთვის ვირტუალური ოთახი არ არის",
         "unban": "მოხსნის მომხმარებლის აკრძალვას მოცემული ID-ით",
         "unflip": "ამზადებს ┬──┬ ノ( ゜-゜ノ) უბრალო ტექსტურ შეტყობინებას",
         "unholdcall": "წყვეტს ზარს მიმდინარე ოთახში",
diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index 8f2e6ccb97..782980078d 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -82,7 +82,6 @@
         "react": "ປະຕິກິລິຍາ",
         "refresh": "ໂຫຼດຫນ້າຈໍຄືນ",
         "register": "ລົງທະບຽນ",
-        "reject": "ປະຕິເສດ",
         "remove": "ເອົາອອກ",
         "rename": "ປ່ຽນຊື່",
         "reply": "ຕອບ",
@@ -369,7 +368,6 @@
         "capabilities": "ຄວາມສາມາດ",
         "copied": "ສຳເນົາແລ້ວ!",
         "credits": "ສິນເຊື່ອ",
-        "cross_signing": "ການເຂົ້າລະຫັດແບບໄຂ້ວ",
         "dark": "ມືດ",
         "description": "ລາຍລະອຽດ",
         "deselect_all": "ຍົກເລີກການເລືອກທັງໝົດ",
@@ -663,43 +661,23 @@
     "empty_room": "ຫ້ອງຫວ່າງ",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "ກະລຸນາໃສ່ປະໂຫຍກຄວາມປອດໄພຂອງທ່ານ ຫຼື <button>ໃຊ້ກະແຈຄວາມປອດໄພຂອງທ່ານ</button> ເພື່ອສືບຕໍ່.",
             "key_validation_text": {
-                "invalid_security_key": "ກະແຈຄວາມປອດໄພບໍ່ຖືກຕ້ອງ",
-                "recovery_key_is_correct": "ດີ!",
-                "wrong_file_type": "ປະເພດໄຟລ໌ບໍ່ຖຶກຕ້ອງ",
                 "wrong_security_key": "ກະແຈຄວາມປອດໄພບໍ່ຖຶກຕ້ອງ"
             },
-            "reset_title": "ຕັ້ງຄ່າໃໝ່ທຸກຢ່າງ",
-            "reset_warning_1": "ເຮັດແນວນີ້ກໍ່ຕໍ່ເມື່ອທ່ານບໍ່ມີອຸປະກອນອື່ນເພື່ອການຢັ້ງຢືນດ້ວຍ.",
-            "reset_warning_2": "ຖ້າທ່ານຕັ້ງຄ່າຄືນໃໝ່ທຸກຢ່າງ, ທ່ານຈະຣີສະຕາດໂດຍບໍ່ມີລະບົບທີ່ເຊື່ອຖືໄດ້, ບໍ່ມີຜູ້ໃຊ້ທີ່ເຊື່ອຖືໄດ້ ແລະ ອາດຈະບໍ່ເຫັນຂໍ້ຄວາມທີ່ຜ່ານມາ.",
             "restoring": "ການຟື້ນຟູລະຫັດຈາກການສໍາຮອງຂໍ້ມູນ",
-            "security_key_title": "ກະແຈຄວາມປອດໄພ",
-            "security_phrase_incorrect_error": "ບໍ່ສາມາດເຂົ້າເຖິງບ່ອນເກັບຂໍ້ມູນລັບໄດ້. ກະລຸນາກວດສອບວ່າທ່ານໃສ່ປະໂຫຍກຄວາມປອດໄພທີ່ຖືກຕ້ອງ.",
-            "security_phrase_title": "ປະໂຫຍກລະຫັດຄວາມປອດໄພ",
-            "use_security_key_prompt": "ໃຊ້ກະແຈຄວາມປອດໄພຂອງທ່ານເພື່ອສືບຕໍ່."
+            "security_key_title": "ກະແຈຄວາມປອດໄພ"
         },
         "bootstrap_title": "ການຕັ້ງຄ່າກະແຈ",
         "cancel_entering_passphrase_description": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຍົກເລີກການໃສ່ປະໂຫຍກລະຫັດຜ່ານ?",
         "cancel_entering_passphrase_title": "ຍົກເລີກການໃສ່ປະໂຫຍກລະຫັດຜ່ານບໍ?",
         "confirm_encryption_setup_body": "ກົດທີ່ປຸ່ມຂ້າງລຸ່ມນີ້ເພື່ອຢືນຢັນການຕັ້ງຄ່າການເຂົ້າລະຫັດ.",
         "confirm_encryption_setup_title": "ຢືນຢັນການຕັ້ງຄ່າການເຂົ້າລະຫັດ",
-        "cross_signing_not_ready": "ບໍ່ໄດ້ຕັ້ງຄ່າ Cross-signing.",
-        "cross_signing_ready": "ການລົງຊື່ຂ້າມແມ່ນກຽມພ້ອມສໍາລັບການໃຊ້ງານ.",
-        "cross_signing_ready_no_backup": "ການລົງຊື່ຂ້າມແມ່ນພ້ອມແລ້ວແຕ່ກະແຈບໍ່ໄດ້ສຳຮອງໄວ້.",
         "cross_signing_room_normal": "ຫ້ອງນີ້ຖືກເຂົ້າລະຫັດແບບຕົ້ນທາງ-ເຖິງປາຍທາງ",
         "cross_signing_room_verified": "ທຸກຄົນຢູ່ໃນຫ້ອງນີ້ໄດ້ຮັບການຢັ້ງຢືນແລ້ວ",
         "cross_signing_room_warning": "ບາງຄົນກໍາລັງໃຊ້ເງື່ອນໄຂທີ່ບໍ່ຮູ້ຈັກ",
-        "cross_signing_unsupported": "homeserverຂອງທ່ານບໍ່ຮອງຮັບການລົງຊື່ຂ້າມ.",
-        "cross_signing_untrusted": "ບັນຊີຂອງທ່ານມີຂໍ້ມູນແບບ cross-signing ໃນການເກັບຮັກສາຄວາມລັບ, ແຕ່ວ່າຍັງບໍ່ມີຄວາມເຊື່ອຖືໃນລະບົບນີ້.",
         "cross_signing_user_normal": "ທ່ານຍັງບໍ່ໄດ້ຢືນຢັນຜູ້ໃຊ້ນີ້.",
         "cross_signing_user_verified": "ທ່ານໄດ້ຢັ້ງຢືນຜູ້ໃຊ້ນີ້ແລ້ວ. ຜູ້ໃຊ້ນີ້ໄດ້ຢັ້ງຢືນທຸກເງິຶອນໄຂຂອງເຂົາເຈົ້າແລ້ວ.",
         "cross_signing_user_warning": "ຜູ້ໃຊ້ນີ້ຍັງບໍ່ໄດ້ຢຶນຢັນການເຂົ້າຮ່ວມຂອງເຂົາເຈົ້າທັງຫມົດຂອງ.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "ລຶບກະເເຈ cross-signing",
-            "title": "ທໍາລາຍກະແຈການເຊັນຮ່ວມ cross-signing ບໍ?",
-            "warning": "ການລຶບລະຫັດ cross-signing ແມ່ນຖາວອນ. ໃຜກໍຕາມທີ່ທ່ານໄດ້ຢັ້ງຢືນດ້ວຍຈະເຫັນການແຈ້ງເຕືອນຄວາມປອດໄພ. ທ່ານບໍ່ຕ້ອງເຮັດສິ່ງນີ້ເລີຍ, ເວັ້ນເສຍແຕ່ວ່າທ່ານເຮັດທຸກອຸກອນເສຍ ທີ່ທ່ານສາມາດຂ້າມເຂົ້າສູ່ລະບົບໄດ້."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "ອຸປະກອນນີ້ບໍ່ສາມາດຮັບປະກັນຄວາມຖືກຕ້ອງຂອງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດນີ້ໄດ້.",
         "event_shield_reason_mismatched_sender_key": "ເຂົ້າລະຫັດໂດຍພາກສ່ວນທີ່ບໍ່ໄດ້ຮັບການຢືນຢັນ",
         "export_unsupported": "ບຣາວເຊີຂອງທ່ານບໍ່ຮອງຮັບການເພິ່ມເຂົ້າລະຫັດລັບທີ່ຕ້ອງການ",
@@ -719,7 +697,6 @@
             "title": "ວິທີການກູ້ຄືນໃຫມ່",
             "warning": "ຖ້າທ່ານບໍ່ໄດ້ກຳນົດວິທີການກູ້ຄືນໃໝ່, ຜູ້ໂຈມຕີອາດຈະພະຍາຍາມເຂົ້າເຖິງບັນຊີຂອງທ່ານ. ປ່ຽນລະຫັດຜ່ານບັນຊີຂອງທ່ານ ແລະກຳນົດ ວິທີການກູ້ຄືນໃໝ່ທັນທີໃນການຕັ້ງຄ່າ."
         },
-        "not_supported": "<ບໍ່ຮອງຮັບ>",
         "recovery_method_removed": {
             "description_1": "ລະບົບນີ້ໄດ້ກວດພົບປະໂຫຍກຄວາມປອດໄພ ແລະ ກະແຈຂໍ້ຄວາມທີ່ປອດໄພຂອງທ່ານໄດ້ຖືກເອົາອອກແລ້ວ.",
             "description_2": "ຖ້າທ່ານດຳເນີນການສິ່ງນີ້ໂດຍບໍ່ໄດ້ຕັ້ງໃຈ, ທ່ານສາມາດຕັ້ງຄ່າຄວາມປອດໄພຂອງຂໍ້ຄວາມ ໃນລະບົບນີ້ ເຊິ່ງຈະມີການເຂົ້າລະຫັດປະຫວັດຂໍ້ຄວາມຂອງລະບົບນີ້ຄືນໃໝ່ດ້ວຍຂະບວນການກູ້ຂໍ້ມູນໃໝ່.",
@@ -730,8 +707,7 @@
         "set_up_toast_description": "ປ້ອງກັນການສູນເສຍການເຂົ້າເຖິງຂໍ້ຄວາມ ແລະຂໍ້ມູນທີ່ເຂົ້າລະຫັດ",
         "set_up_toast_title": "ຕັ້ງຄ່າການສໍາຮອງຂໍ້ມູນທີ່ປອດໄພ",
         "setup_secure_backup": {
-            "explainer": "ສຳຮອງຂໍ້ມູນກະແຈຂອງທ່ານກ່ອນທີ່ຈະອອກຈາກລະບົບເພື່ອຫຼີກເວັ້ນການສູນເສຍຂໍ້ມູນ.",
-            "title": "ຕັ້ງຄ່າ"
+            "explainer": "ສຳຮອງຂໍ້ມູນກະແຈຂອງທ່ານກ່ອນທີ່ຈະອອກຈາກລະບົບເພື່ອຫຼີກເວັ້ນການສູນເສຍຂໍ້ມູນ."
         },
         "udd": {
             "other_ask_verify_text": "ຂໍໃຫ້ຜູ້ໃຊ້ນີ້ກວດສອບລະບົບຂອງເຂົາເຈົ້າ, ຫຼື ຢືນຢັນດ້ວຍຕົນເອງຂ້າງລຸ່ມນີ້.",
@@ -745,7 +721,6 @@
             "accepting": "ກຳລັງຍອມຮັບ…",
             "after_new_login": {
                 "device_verified": "ຢັ້ງຢືນອຸປະກອນແລ້ວ",
-                "reset_confirmation": "ຕັ້ງຄ່າຢືນຢັນກະແຈຄືນໃໝ່ບໍ?",
                 "skip_verification": "ຂ້າມການຢັ້ງຢືນດຽວນີ້",
                 "unable_to_verify": "ບໍ່ສາມາດຢັ້ງຢືນອຸປະກອນນີ້ໄດ້",
                 "verify_this_device": "ຢັ້ງຢືນອຸປະກອນນີ້"
@@ -807,7 +782,6 @@
             "verify_emoji_prompt": "ຢັ້ງຢືນໂດຍການປຽບທຽບ emoji ທີ່ເປັນເອກະລັກ.",
             "verify_emoji_prompt_qr": "ຖ້າທ່ານບໍ່ສາມາດສະແກນລະຫັດຂ້າງເທິງໄດ້, ໃຫ້ກວດສອບໂດຍການປຽບທຽບອີໂມຈິທີ່ເປັນເອກະລັກ.",
             "verify_later": "ຂ້ອຍຈະກວດສອບພາຍຫຼັງ",
-            "verify_reset_warning_1": "ການຕັ້ງຄ່າລະຫັດຢືນຢັນຂອງທ່ານບໍ່ສາມາດຍົກເລີກໄດ້. ຫຼັງຈາກການຕັ້ງຄ່າແລ້ວ, ທ່ານຈະບໍ່ສາມາດເຂົ້າເຖິງຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດເກົ່າໄດ້, ແລະ ໝູ່ເພື່ອນທີ່ຢືນຢັນໄປກ່ອນໜ້ານີ້ ທ່ານຈະເຫັນຄຳເຕືອນຄວາມປອດໄພຈົນກວ່າທ່ານຈະຢືນຢັນກັບພວກມັນຄືນໃໝ່.",
             "verify_using_device": "ຢັ້ງຢືນດ້ວຍອຸປະກອນອື່ນ",
             "verify_using_key": "ຢືນຢັນດ້ວຍກະແຈຄວາມປອດໄພ",
             "verify_using_key_or_phrase": "ຢືນຢັນດ້ວຍກະແຈຄວາມປອດໄພ ຫຼືປະໂຫຍກ",
@@ -862,11 +836,7 @@
             "title": "ບໍ່ສາມາດສຳເນົາລິ້ງຫ້ອງໄດ້"
         },
         "error_loading_user_profile": "ບໍ່ສາມາດໂຫຼດໂປຣໄຟລ໌ຂອງຜູ້ໃຊ້ໄດ້",
-        "forget_room_failed": "ບໍ່ສາມາດລືມຫ້ອງ ໄດ້%(errCode)s",
-        "search_failed": {
-            "server_unavailable": "ເຊີບເວີອາດຈະບໍ່ມີຢູ່, ໂຫຼດເກີນ, ຫຼື ໝົດເວລາການຊອກຫາ :(",
-            "title": "ຄົ້ນຫາບໍ່ສຳເລັດ"
-        }
+        "forget_room_failed": "ບໍ່ສາມາດລືມຫ້ອງ ໄດ້%(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1372,11 +1342,6 @@
         "ongoing": "ກຳລັງລຶບ…",
         "reason_label": "ເຫດຜົນ (ທາງເລືອກ)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການປະຕິເສດຄຳເຊີນ?",
-        "failed": "ປະຕິເສດຄຳເຊີນບໍ່ສຳເລັດ",
-        "title": "ປະຕິເສດຄຳເຊີນ"
-    },
     "report_content": {
         "description": "ການລາຍງານຂໍ້ຄວາມນີ້ຈະສົ່ງ 'ID ເຫດການ' ທີ່ບໍ່ຊໍ້າກັນໄປຫາຜູ້ຄຸ້ມຄອງລະບົບເຊີບເວີຂອງທ່ານ. ຖ້າຂໍ້ຄວາມຢູ່ໃນຫ້ອງນີ້ຖືກເຂົ້າລະຫັດໄວ້, ຜູ້ຄຸ້ມຄອງລະບົບເຊີບເວີຂອງທ່ານຈະບໍ່ສາມາດອ່ານຂໍ້ຄວາມ ຫຼືເບິ່ງໄຟລ໌ ຫຼືຮູບພາບຕ່າງໆໄດ້.",
         "disagree": "ບໍ່ເຫັນດີ",
@@ -1506,7 +1471,6 @@
             "you_created": "ທ່ານສ້າງຫ້ອງນີ້."
         },
         "invite_email_mismatch_suggestion": "ແບ່ງປັນອີເມວນີ້ໃນການຕັ້ງຄ່າເພື່ອຮັບການເຊີນໂດຍກົງໃນ %(brand)s.",
-        "invite_reject_ignore": "ປະຕິເສດ ແລະ ບໍ່ສົນໃຈຜູ້ໃຊ້",
         "invite_sent_to_email": "ການເຊີນນີ້ຖືກສົ່ງໄປຫາ %(email)s",
         "invite_sent_to_email_room": "ການເຊີນນີ້ໄປຫາ %(roomName)s ໄດ້ຖືກສົ່ງໄປຫາ %(email)s",
         "invite_subtitle": "<userName/> ເຊີນທ່ານ",
@@ -1955,7 +1919,6 @@
             "remove_email_prompt": "ລຶບ %(email)s ອອກບໍ?",
             "remove_msisdn_prompt": "ລຶບ %(phone)sອອກບໍ?"
         },
-        "image_thumbnails": "ສະແດງຕົວຢ່າງ/ຮູບຕົວຢ່າງສຳລັບຮູບພາບ",
         "inline_url_previews_default": "ເປີດໃຊ້ການສະແດງຕົວຢ່າງ URL ໃນແຖວຕາມຄ່າເລີ່ມຕົ້ນ",
         "inline_url_previews_room": "ເປີດໃຊ້ການສະແດງຕົວຢ່າງ URL ໂດຍຄ່າເລີ່ມຕົ້ນສໍາລັບຜູ້ເຂົ້າຮ່ວມໃນຫ້ອງນີ້",
         "inline_url_previews_room_account": "ເປີດໃຊ້ຕົວຢ່າງ URL ສໍາລັບຫ້ອງນີ້ (ມີຜົນຕໍ່ທ່ານເທົ່ານັ້ນ)",
@@ -2050,48 +2013,16 @@
         "prompt_invite": "ເຕືອນກ່ອນທີ່ຈະສົ່ງຄໍາເຊີນໄປຫາ ID matrix ທີ່ອາດຈະບໍ່ຖືກຕ້ອງ",
         "replace_plain_emoji": "ປ່ຽນແທນ Emoji ຂໍ້ຄວາມທຳມະດາໂດຍອັດຕະໂນມັດ",
         "security": {
-            "4s_public_key_in_account_data": "ໃນຂໍ້ມູນບັນຊີ",
-            "4s_public_key_status": "ກະເເຈສາທາລະນະການເກັບຮັກສາຄວາມລັບ:",
-            "backup_key_cached_status": "ລະຫັດສໍາຮອງຂໍ້ມູນທີ່ເກັບໄວ້:",
-            "backup_key_stored_status": "ກະແຈສຳຮອງທີ່ເກັບໄວ້:",
-            "backup_key_unexpected_type": "ປະເພດທີ່ບໍ່ຄາດຄິດ",
-            "backup_key_well_formed": "ສ້າງຕັ້ງຂຶ້ນ",
-            "backup_keys_description": "ສຳຮອງຂໍ້ມູນລະຫັດການເຂົ້າລະຫັດຂອງທ່ານດ້ວຍຂໍ້ມູນບັນຊີຂອງທ່ານໃນກໍລະນີທີ່ທ່ານສູນເສຍການເຂົ້າເຖິງລະບົບຂອງທ່ານ. ກະແຈຂອງທ່ານຈະຖືກຮັກສາໄວ້ດ້ວຍກະແຈຄວາມປອດໄພທີ່ເປັນເອກະລັກ.",
             "bulk_options_accept_all_invites": "ຍອມຮັບການເຊີນທັງໝົດ %(invitedRooms)s",
             "bulk_options_reject_all_invites": "ປະຕິເສດການເຊີນທັງໝົດ %(invitedRooms)s",
             "bulk_options_section": "ຕົວເລືອກຈຳນວນຫຼາຍ",
-            "cross_signing_cached": "ເກັບໄວ້ໃນ cached ເຄື່ອງ",
-            "cross_signing_homeserver_support": "ສະຫນັບສະຫນູນຄຸນນະສົມບັດ Homeserver:",
-            "cross_signing_homeserver_support_exists": "ມີຢູ່",
-            "cross_signing_in_4s": "ໃນການເກັບຮັກສາຄວາມລັບ",
-            "cross_signing_in_memory": "ໃນຄວາມຊົງຈໍາ",
-            "cross_signing_master_private_Key": "ລະຫັດສ່ວນຕົວຫຼັກ:",
-            "cross_signing_not_cached": "ບໍ່ພົບຢູ່ໃນເຄື່ອງ",
-            "cross_signing_not_found": "ບໍ່ພົບເຫັນ",
-            "cross_signing_not_in_4s": "ບໍ່ພົບຢູ່ໃນບ່ອນເກັບມ້ຽນ",
-            "cross_signing_not_stored": "ບໍ່ໄດ້ເກັບຮັກສາໄວ້",
-            "cross_signing_private_keys": "ກະແຈສ່ວນຕົວCross-signing :",
-            "cross_signing_public_keys": "ກະແຈສາທາລະນະທີ່ມີ Cross-signing:",
-            "cross_signing_self_signing_private_key": "ລະຫັດສ່ວນຕົວທີ່ເຊັນດ້ວຍຕົນເອງ:",
-            "cross_signing_user_signing_private_key": "ຜູ້ໃຊ້ເຂົ້າສູ່ລະບົບລະຫັດສ່ວນຕົວ:",
-            "cryptography_section": "ການເຂົ້າລະຫັດລັບ",
-            "delete_backup": "ລຶບການສຳຮອງຂໍ້ມູນ",
-            "delete_backup_confirm_description": "ທ່ານແນ່ໃຈບໍ່? ທ່ານຈະສູນເສຍຂໍ້ຄວາມທີ່ເຂົ້າລະຫັດໄວ້ຫາກກະແຈຂອງທ່ານບໍ່ຖືກສຳຮອງຂໍ້ມູນຢ່າງຖືກຕ້ອງ.",
             "e2ee_default_disabled_warning": "ຜູ້ຄຸມເຊີບເວີຂອງທ່ານໄດ້ປິດການນຳໃຊ້ການເຂົ້າລະຫັດແບບຕົ້ນທາງຮອດປາຍທາງໂດຍຄ່າເລີ່ມຕົ້ນໃນຫ້ອງສ່ວນຕົວ ແລະ ຂໍ້ຄວາມໂດຍກົງ.",
             "enable_message_search": "ເປີດໃຊ້ການຊອກຫາຂໍ້ຄວາມຢູ່ໃນຫ້ອງທີ່ຖືກເຂົ້າລະຫັດ",
             "encryption_section": "ການເຂົ້າລະຫັດ",
-            "error_loading_key_backup_status": "ບໍ່ສາມາດໂຫຼດສະຖານະສຳຮອງລະຫັດໄດ້",
-            "export_megolm_keys": "ສົ່ງກະແຈຫ້ອງ E2E ອອກ",
             "ignore_users_empty": "ທ່ານບໍ່ມີຜູ້ໃຊ້ທີ່ຖືກລະເລີຍ.",
             "ignore_users_section": "ຜູ້ໃຊ້ຖືກຍົກເວັ້ນ",
-            "import_megolm_keys": "ນຳເຂົ້າກະແຈຫ້ອງ E2E",
-            "key_backup_active_version_none": "ບໍ່ມີ",
             "key_backup_algorithm": "ສູດການຄິດໄລ່:",
-            "key_backup_complete": "ກະແຈທັງໝົດຖືກສຳຮອງໄວ້",
             "key_backup_connect": "ເຊື່ອມຕໍ່ລະບົບນີ້ກັບ ກະເເຈສຳຮອງ",
-            "key_backup_connect_prompt": "ເຊື່ອມຕໍ່ລະບົບນີ້ກັບການສໍາຮອງກະແຈກ່ອນທີ່ຈະອອກຈາກລະບົບເພື່ອຫຼີກເວັ້ນການສູນເສຍກະແຈທີ່ອາດຢູ່ໃນລະບົບນີ້ເທົ່ານັ້ນ.",
-            "key_backup_inactive": "ລະບົບນີ້ແມ່ນ <b>ບໍ່ໄດ້ສໍາຮອງລະຫັດຂອງທ່ານ</b>, ແຕ່ທ່ານມີການສໍາຮອງຂໍ້ມູນທີ່ມີຢູ່ແລ້ວທີ່ທ່ານສາມາດກູ້ຄືນຈາກ ແລະເພີ່ມຕໍ່ໄປ.",
-            "key_backup_inactive_warning": "ກະແຈຂອງທ່ານ <b>ບໍ່ຖືກສຳຮອງຂໍ້ມູນຈາກລະບົບນີ້</b>.",
             "message_search_disable_warning": "ຖ້າປິດໃຊ້ງານ, ຂໍ້ຄວາມຈາກຫ້ອງທີ່ເຂົ້າລະຫັດຈະບໍ່ປາກົດຢູ່ໃນຜົນການຄົ້ນຫາ.",
             "message_search_disabled": "ເກັບຮັກສາຂໍ້ຄວາມທີ່ຖືກເຂົ້າລະຫັດໄວ້ຢ່າງປອດໄພຢູ່ໃນເຄື່ອງເພື່ອໃຫ້ປາກົດໃນຜົນການຄົ້ນຫາ.",
             "message_search_enabled": {
@@ -2110,13 +2041,7 @@
             "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> ເພື່ອໃຫ້ຂໍ້ຄວາມເຂົ້າລະຫັດຈະປາກົດໃນຜົນການຊອກຫາ.",
-            "restore_key_backup": "ກູ້ຄືນຈາກການສໍາຮອງຂໍ້ມູນ",
-            "secret_storage_not_ready": "ບໍ່ພ້ອມ",
-            "secret_storage_ready": "ພ້ອມ",
-            "secret_storage_status": "ການເກັບຮັກສາຄວາມລັບ:",
             "send_analytics": "ສົ່ງຂໍ້ມູນການວິເຄາະ",
-            "session_id": "ID ລະບົບ:",
-            "session_key": "ກະແຈລະບົບ:",
             "strict_encryption": "ບໍ່ສົ່ງຂໍ້ຄວາມເຂົ້າລະຫັດໄປຫາລະບົບທີ່ບໍ່ໄດ້ຢືນຢັນຈາກລະບົບນີ້"
         },
         "send_typing_notifications": "ສົ່ງການແຈ້ງເຕືອນການພິມ",
@@ -2243,8 +2168,6 @@
         "topic": "ໄດ້ຮັບ ຫຼື ກໍານົດຫົວຂໍ້ຫ້ອງ",
         "topic_none": "ຫ້ອງນີ້ບໍ່ມີຫົວຂໍ້.",
         "topic_room_error": "ໂຫຼດຫົວຂໍ້ຫ້ອງບໍ່ສຳເລັດ: ບໍ່ສາມາດຊອກຫາຫ້ອງ (%(roomId)s",
-        "tovirtual": "ສະຫຼັບໄປໃຊ້ຫ້ອງສະເໝືອນຈິງ, ຖ້າມີອີກຫ້ອງໜຶ່ງ",
-        "tovirtual_not_found": "ບໍ່ມີຫ້ອງສະເໝືອນຈິງສຳລັບຫ້ອງນີ້",
         "unban": "ຍົກເລີກການຫ້າມຜູ້ໃຊ້ທີ່ມີ ID",
         "unflip": "ນຳໜ້າ ┬──┬ ノ( ゜-゜ノ)ເປັນຂໍ້ຄວາມທຳມະດາ",
         "unholdcall": "ການຮັບສາຍໃນຫ້ອງປະຈຸບັນຖຶກປິດໄວ້",
@@ -2350,13 +2273,11 @@
         "heading_with_query": "ໃຊ້ \"%(query)s\" ເພື່ອຊອກຫາ",
         "join_button_text": "ເຂົ້າຮ່ວມ %(roomAddress)s",
         "keyboard_scroll_hint": "ໃຊ້ <arrows/> ເພື່ອເລື່ອນ",
-        "message_search_section_title": "ການຄົ້ນຫາອື່ນໆ",
         "other_rooms_in_space": "ຫ້ອງອື່ນໆ%(spaceName)s",
         "public_rooms_label": "ຫ້ອງສາທາລະນະ",
         "recent_searches_section_title": "ການຄົ້ນຫາທີ່ຜ່ານມາ",
         "recently_viewed_section_title": "ເບິ່ງເມື່ອບໍ່ດົນມານີ້",
         "search_dialog": "ຊອກຫາ ກ່ອງໂຕ້ຕອບ",
-        "search_messages_hint": "ເພື່ອຊອກຫາຂໍ້ຄວາມ, ຊອກຫາໄອຄອນນີ້ຢູ່ເທິງສຸດຂອງຫ້ອງ <icon/>",
         "spaces_title": "ຊ່ອງທີ່ທ່ານຢູ່"
     },
     "stickers": {
diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index cfc0d828d1..3c8ca8fbab 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -58,7 +58,7 @@
         "invites_list": "Pakvietimai",
         "join": "Prisijungti",
         "learn_more": "Sužinokite daugiau",
-        "leave": "Išeiti",
+        "leave": "Palikti",
         "leave_room": "Išeiti iš kambario",
         "logout": "Atsijungti",
         "manage": "Tvarkyti",
@@ -75,7 +75,6 @@
         "react": "Reaguoti",
         "refresh": "Įkelti iš naujo",
         "register": "Registruotis",
-        "reject": "Atmesti",
         "remove": "Pašalinti",
         "rename": "Pervadinti",
         "reply": "Atsakyti",
@@ -301,7 +300,6 @@
         "camera": "Kamera",
         "copied": "Nukopijuota!",
         "credits": "Padėka",
-        "cross_signing": "Kryžminis pasirašymas",
         "dark": "Tamsi",
         "description": "Aprašas",
         "deselect_all": "Nuimti pasirinkimą nuo visko",
@@ -501,41 +499,22 @@
     "encryption": {
         "access_secret_storage_dialog": {
             "key_validation_text": {
-                "invalid_security_key": "Klaidingas Saugumo Raktas",
-                "recovery_key_is_correct": "Atrodo gerai!",
-                "wrong_file_type": "Netinkamas failo tipas",
                 "wrong_security_key": "Netinkamas Saugumo Raktas"
             },
-            "reset_title": "Iš naujo nustatyti viską",
-            "reset_warning_1": "Taip darykite tik tuo atveju, jei neturite kito prietaiso, kuriuo galėtumėte užbaigti patikrinimą.",
-            "reset_warning_2": "Jei viską nustatysite iš naujo, paleisite iš naujo be patikimų seansų, be patikimų vartotojų ir galbūt negalėsite matyti ankstesnių žinučių.",
             "restoring": "Raktų atkūrimas iš atsarginės kopijos",
-            "security_key_title": "Saugumo Raktas",
-            "security_phrase_incorrect_error": "Nepavyksta pasiekti slaptosios saugyklos. Prašome patvirtinti kad teisingai įvedėte Saugumo Frazę.",
-            "security_phrase_title": "Slaptafrazė",
-            "use_security_key_prompt": "Naudokite Saugumo Raktą kad tęsti."
+            "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_not_ready": "Kryžminis pasirašymas nenustatytas.",
-        "cross_signing_ready": "Kryžminis pasirašymas yra paruoštas naudoti.",
-        "cross_signing_ready_no_backup": "Kryžminis pasirašymas paruoštas, tačiau raktai neturi atsarginės kopijos.",
         "cross_signing_room_normal": "Šis kambarys visapusiškai užšifruotas",
         "cross_signing_room_verified": "Visi šiame kambaryje yra patvirtinti",
         "cross_signing_room_warning": "Kažkas naudoja nežinomą seansą",
-        "cross_signing_unsupported": "Jūsų serveris nepalaiko kryžminio pasirašymo.",
-        "cross_signing_untrusted": "Jūsų paskyra slaptoje saugykloje turi kryžminio pasirašymo tapatybę, bet šis seansas dar ja nepasitiki.",
         "cross_signing_user_normal": "Jūs nepatvirtinote šio vartotojo.",
         "cross_signing_user_verified": "Jūs patvirtinote šį vartotoją. Šis vartotojas patvirtino visus savo seansus.",
         "cross_signing_user_warning": "Šis vartotojas nepatvirtino visų savo seansų.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Valyti kryžminio pasirašymo raktus",
-            "title": "Sunaikinti kryžminio pasirašymo raktus?",
-            "warning": "Kryžminio pasirašymo raktų ištrinimas yra neatšaukiamas. Visi, kurie buvo jais patvirtinti, matys saugumo įspėjimus. Jūs greičiausiai nenorite to daryti, nebent praradote visus įrenginius, iš kurių galite patvirtinti kryžminiu pasirašymu."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Šiame įrenginyje negalima užtikrinti šios užšifruotos žinutės autentiškumo.",
         "event_shield_reason_mismatched_sender_key": "Užšifruota nepatvirtinto seanso",
         "export_unsupported": "Jūsų naršyklė nepalaiko reikalingų kriptografijos plėtinių",
@@ -554,7 +533,6 @@
             "title": "Naujas atgavimo metodas",
             "warning": "Jei jūs nenustatėte naujo 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ą."
         },
-        "not_supported": "<nepalaikoma>",
         "recovery_method_removed": {
             "description_2": "Jei tai padarėte netyčia, šiame seanse galite nustatyti saugias žinutes, kurios pakartotinai užšifruos šio seanso žinučių istoriją nauju atgavimo metodu.",
             "title": "Atgavimo Metodas Pašalintas",
@@ -564,8 +542,7 @@
         "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.",
-            "title": "Nustatyti"
+            "explainer": "Prieš atsijungdami sukurkite atsarginę savo raktų kopiją, kad išvengtumėte jų praradimo."
         },
         "udd": {
             "other_ask_verify_text": "Paprašykite šio vartotojo patvirtinti savo seansą, arba patvirtinkite jį rankiniu būdu žemiau.",
@@ -674,11 +651,7 @@
             "description": "Nepavyko nukopijuoti nuorodos į kambarį į iškarpinę.",
             "title": "Nepavyko nukopijuoti kambario nurodos"
         },
-        "forget_room_failed": "Nepavyko pamiršti kambario %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Gali būti, kad serveris neprieinamas, perkrautas arba pasibaigė paieškai skirtas laikas :(",
-            "title": "Paieška nepavyko"
-        }
+        "forget_room_failed": "Nepavyko pamiršti kambario %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -995,11 +968,6 @@
         "ongoing": "Pašalinama…",
         "reason_label": "Priežastis (nebūtina)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ar tikrai norite atmesti pakvietimą?",
-        "failed": "Nepavyko atmesti pakvietimo",
-        "title": "Atmesti pakvietimą"
-    },
     "report_content": {
         "description": "Pranešant apie šią netinkamą žinutę, serverio administratoriui bus nusiųstas unikalus 'įvykio ID'. Jei žinutės šiame kambaryje yra šifruotos, serverio administratorius negalės perskaityti žinutės teksto ar peržiūrėti failų arba paveikslėlių.",
         "missing_reason": "Įrašykite kodėl pranešate.",
@@ -1095,7 +1063,6 @@
             "you_created": "Jūs sukūrėte šį kambarį."
         },
         "invite_email_mismatch_suggestion": "Bendrinkite šį el. pašto adresą nustatymuose, kad gautumėte kvietimus tiesiai į %(brand)s.",
-        "invite_reject_ignore": "Atmesti ir ignoruoti vartotoją",
         "invite_sent_to_email": "Šis kvietimas buvo išsiųstas į %(email)s",
         "invite_sent_to_email_room": "Šis kvietimas į %(roomName)s buvo išsiųstas į %(email)s",
         "invite_subtitle": "<userName/> jus pakvietė",
@@ -1508,7 +1475,6 @@
             "remove_email_prompt": "Pašalinti %(email)s?",
             "remove_msisdn_prompt": "Pašalinti %(phone)s?"
         },
-        "image_thumbnails": "Rodyti vaizdų peržiūras/miniatiūras",
         "inline_url_previews_default": "Įjungti URL nuorodų peržiūras kaip numatytasias",
         "inline_url_previews_room": "Įjungti URL nuorodų peržiūras kaip numatytasias šiame kambaryje esantiems dalyviams",
         "inline_url_previews_room_account": "Įjungti URL nuorodų peržiūras šiame kambaryje (įtakoja tik jus)",
@@ -1598,48 +1564,16 @@
         "prompt_invite": "Klausti prieš siunčiant pakvietimus galimai netinkamiems matrix ID",
         "replace_plain_emoji": "Automatiškai pakeisti paprasto teksto Jaustukus",
         "security": {
-            "4s_public_key_in_account_data": "paskyros duomenyse",
-            "4s_public_key_status": "Slaptos saugyklos viešas raktas:",
-            "backup_key_cached_status": "Atsarginis raktas išsaugotas talpykloje:",
-            "backup_key_stored_status": "Atsarginis raktas saugomas:",
-            "backup_key_unexpected_type": "netikėto tipo",
-            "backup_key_well_formed": "gerai suformuotas",
-            "backup_keys_description": "Pasidarykite šifravimo raktų ir paskyros duomenų atsarginę kopiją, jei prarastumėte prieigą prie sesijų. Jūsų raktai bus apsaugoti unikaliu saugumo raktu.",
             "bulk_options_accept_all_invites": "Priimti visus %(invitedRooms)s pakvietimus",
             "bulk_options_reject_all_invites": "Atmesti visus %(invitedRooms)s pakvietimus",
             "bulk_options_section": "Grupinės parinktys",
-            "cross_signing_cached": "lokaliame podėlyje",
-            "cross_signing_homeserver_support": "Serverio funkcijų palaikymas:",
-            "cross_signing_homeserver_support_exists": "yra",
-            "cross_signing_in_4s": "slaptoje saugykloje",
-            "cross_signing_in_memory": "atmintyje",
-            "cross_signing_master_private_Key": "Pagrindinis privatus raktas:",
-            "cross_signing_not_cached": "lokaliai nerasta",
-            "cross_signing_not_found": "nerasta",
-            "cross_signing_not_in_4s": "saugykloje nerasta",
-            "cross_signing_not_stored": "nesaugomas",
-            "cross_signing_private_keys": "Kryžminio pasirašymo privatūs raktai:",
-            "cross_signing_public_keys": "Kryžminio pasirašymo vieši raktai:",
-            "cross_signing_self_signing_private_key": "Savarankiško pasirašymo privatus raktas:",
-            "cross_signing_user_signing_private_key": "Vartotojo pasirašymo privatus raktas:",
-            "cryptography_section": "Kriptografija",
-            "delete_backup": "Ištrinti Atsarginę Kopiją",
-            "delete_backup_confirm_description": "Ar tikrai? Jūs prarasite savo šifruotas žinutes, jei jūsų raktams nebus tinkamai sukurtos atsarginės kopijos.",
             "e2ee_default_disabled_warning": "Serverio administratorius išjungė visapusį šifravimą, kaip numatytą, privačiuose kambariuose ir Tiesioginėse Žinutėse.",
             "enable_message_search": "Įjungti žinučių paiešką užšifruotuose kambariuose",
             "encryption_section": "Šifravimas",
-            "error_loading_key_backup_status": "Nepavyko įkelti atsarginės raktų kopijos būklės",
-            "export_megolm_keys": "Eksportuoti E2E (visapusio šifravimo) kambarių raktus",
             "ignore_users_empty": "Nėra ignoruojamų naudotojų.",
             "ignore_users_section": "Ignoruojami vartotojai",
-            "import_megolm_keys": "Importuoti E2E (visapusio šifravimo) kambarių raktus",
-            "key_backup_active_version_none": "Nė vienas",
             "key_backup_algorithm": "Algoritmas:",
-            "key_backup_complete": "Atsarginės kopijos sukurtos visiems raktams",
             "key_backup_connect": "Prijungti šį seansą prie Atsarginės Raktų Kopijos",
-            "key_backup_connect_prompt": "Prieš atsijungdami prijunkite šį seansą prie atsarginės raktų kopijos, kad neprarastumėte raktų, kurie gali būti tik šiame seanse.",
-            "key_backup_inactive": "Šis seansas <b>nekuria atsarginių raktų kopijų</b>, bet jūs jau turite atsarginę kopiją iš kurios galite atkurti ir pridėti.",
-            "key_backup_inactive_warning": "Jūsų raktams <b>nėra daromos atsarginės kopijos iš šio seanso</b>.",
             "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.",
@@ -1650,13 +1584,7 @@
             "message_search_sleep_time": "Kaip greitai žinutės turi būti parsiųstos.",
             "message_search_unsupported": "%(brand)s trūksta kai kurių komponentų, reikalingų saugiai talpinti šifruotas žinutes lokaliai. Jei norite eksperimentuoti su šia funkcija, sukurkite pasirinktinį %(brand)s Desktop (darbastalio versiją), su <nativeLink>pridėtais paieškos komponentais</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s negali saugiai talpinti šifruotų žinučių lokaliai, kai veikia interneto naršyklėje. Naudokite <desktopLink>%(brand)s Desktop (darbastalio versija)</desktopLink>, kad šifruotos žinutės būtų rodomos paieškos rezultatuose.",
-            "restore_key_backup": "Atkurti iš Atsarginės Kopijos",
-            "secret_storage_not_ready": "neparuošta",
-            "secret_storage_ready": "paruošta",
-            "secret_storage_status": "Slapta saugykla:",
             "send_analytics": "Siųsti analitinius duomenis",
-            "session_id": "Seanso ID:",
-            "session_key": "Seanso raktas:",
             "strict_encryption": "Niekada nesiųsti šifruotų žinučių nepatvirtintiems seansams iš šio seanso"
         },
         "send_read_receipts": "Siųsti skaitymo kvitus",
@@ -2012,9 +1940,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 8dff959ef6..739e9a81b0 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -95,7 +95,6 @@
         "react": "Reaģēt",
         "refresh": "Atsvaidzināt",
         "register": "Reģistrēties",
-        "reject": "Noraidīt",
         "reload": "Pārlādēt",
         "remove": "Dzēst",
         "rename": "Pārdēvēt",
@@ -461,7 +460,6 @@
         "capabilities": "Iespējas",
         "copied": "Nokopēts!",
         "credits": "Apliecinājumi",
-        "cross_signing": "Savstarpēja parakstīšana",
         "dark": "Tumša",
         "description": "Apraksts",
         "deselect_all": "Neizvēlēt nevienu",
@@ -835,44 +833,23 @@
     "empty_room_was_name": "Tukša istaba (bija %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Ievadiet savu drošības frāzi vai <button>izmantojiet savu drošības atslēgu</button>, lai turpinātu.",
             "key_validation_text": {
-                "invalid_security_key": "Kļūdaina drošības atslēga",
-                "recovery_key_is_correct": "Izskatās labi!",
-                "wrong_file_type": "Nepareizs datnes veids",
                 "wrong_security_key": "Nepareiza drošības atslēga"
             },
-            "reset_title": "Atiestatīt visu",
-            "reset_warning_1": "Dariet to tikai tad, ja jums nav citas ierīces, ar kuru pabeigt verifikāciju.",
-            "reset_warning_2": "Ja viss tiks attiestatīts, tiks atkal uzsākts bez uzticamām sesijām un lietotājiem un varētu nebūt iespējams redzēt iepriekšējās ziņas.",
             "restoring": "Atslēgu atjaunošana no rezerves kopijas",
-            "security_key_title": "Drošības atslēga",
-            "security_phrase_incorrect_error": "Nebija iespējams piekļūt slepenajai krātuvei. Lūgums pārliecināties, ka ir ievadīta pareiza drošības vārdkopa.",
-            "security_phrase_title": "Slepenā frāze",
-            "separator": "%(securityKey)s vai %(recoveryFile)s",
-            "use_security_key_prompt": "Izmantojiet savu drošības atslēgu, lai turpinātu."
+            "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_not_ready": "Krusteniskā parakstīšana nav iestatīta.",
-        "cross_signing_ready": "Krusteniskā parakstīšana ir gatava lietošanai.",
-        "cross_signing_ready_no_backup": "Krusteniskā parakstīšana ir gatava, bet atslēgas netiek dublētas.",
         "cross_signing_room_normal": "Šajā istabā tiek veikta pilnīga šifrēšana",
         "cross_signing_room_verified": "Visi šajā istabā esošie ir verificēti",
         "cross_signing_room_warning": "Kāds izmanto nezināmu sesiju",
-        "cross_signing_unsupported": "Tavs mājasserveris nenodrošina savstarpējo parakstīšanu.",
-        "cross_signing_untrusted": "Jūsu kontam slepenajā krātuvē ir krusteniskās parakstīšanas identitāte, taču šī sesija tai vēl neuzticas.",
         "cross_signing_user_normal": "Šis lietotājs nav apstiprināts.",
         "cross_signing_user_verified": "Tu apliecināji šo lietotāju. Šis lietotājs ir apliecinājis visas savas sesijas.",
         "cross_signing_user_warning": "Šis lietotājs nav apliecinājis visas savas sesijas.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Dzēst krusteniskās parakstīšanas atslēgas",
-            "title": "Iznīcināt krusteniskās parakstīšanas atslēgas?",
-            "warning": "Krustiskās parakstīšanas atslēgu dzēšana ir neatgriezeniska. Ikviens, ar kuru esat veicis verifikāciju, redzēs drošības brīdinājumus. Jūs gandrīz noteikti nevēlaties to darīt, ja vien neesat pazaudējis katru ierīci, no kuras varat krusteniski parakstīties."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Šīs šifrētās ziņas autentiskums nevar tikt garantēts šajā ierīcē.",
         "event_shield_reason_mismatched_sender_key": "Šifrēts neapliecinātā sesijā",
         "event_shield_reason_unknown_device": "Šifrēts ar nezināmu vai dzēstu ierīci.",
@@ -895,7 +872,6 @@
             "title": "Jauna atkopšanas metode",
             "warning": "Ja neiestatīji jaunu atkopšanas veidu, var būt, ka uzbrucējs mēģina piekļūt Tavam kontam. Nekavējoties iestatījumos jānomaina sava konta parole un jāiestata jauns atkopšanas veids."
         },
-        "not_supported": "<netiek atbalstīts>",
         "recovery_method_removed": {
             "description_1": "Šajā sesijā tika konstatēts, ka jūsu drošības frāze un drošo ziņojumu atslēga ir noņemta.",
             "description_2": "Ja to izdarījāt nejauši, šajā sesijā varat iestatīt drošas ziņas, kas atkārtoti šifrēs šīs sesijas ziņu vēsturi, izmantojot jaunu atkopšanas metodi.",
@@ -906,8 +882,7 @@
         "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.",
-            "title": "Iestatīt"
+            "explainer": "Pirms izrakstīšanās iestatiet atslēgu dublēšanu, lai izvairītos no tās pazaudēšanas."
         },
         "udd": {
             "interactive_verification_button": "Mijiedarbīga apliecināšana ar emocijzīmēm",
@@ -922,7 +897,6 @@
             "accepting": "Apstiprina…",
             "after_new_login": {
                 "device_verified": "Ierīce ir verificēta",
-                "reset_confirmation": "Vai tiešām atiestatīt verifikācijas atslēgas?",
                 "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"
@@ -993,8 +967,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_reset_warning_1": "Verifikācijas atslēgu atiestatīšanu nevar atsaukt. Pēc atiestatīšanas jūs nevarēsit piekļūt vecām šifrētām ziņām, un visi draugi, kas jūs iepriekš ir verificējuši, redzēs drošības brīdinājumus, līdz veiksit atkārtotu verifikāciju.",
-            "verify_reset_warning_2": "Lūdzu, turpiniet tikai tad, ja esat pārliecināts, ka esat zaudējis visas pārējās ierīces un drošības atslēgu.",
             "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",
@@ -1045,11 +1017,7 @@
             "title": "Istabas saiti nevar ievietot starpliktuvē"
         },
         "error_loading_user_profile": "Nevarēja ielādēt lietotāja profilu",
-        "forget_room_failed": "Neizdevās \"aizmirst\" istabu %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
-            "title": "Meklēšana neizdevās"
-        }
+        "forget_room_failed": "Neizdevās \"aizmirst\" istabu %(errCode)s"
     },
     "error_user_not_logged_in": "Lietotājs nav pieteicies",
     "event_preview": {
@@ -1576,11 +1544,6 @@
         "ongoing": "Dzēš…",
         "reason_label": "Iemesls (izvēles)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Vai tiešām noraidīt šo uzaicinājumu?",
-        "failed": "Neizdevās noraidīt uzaicinājumu",
-        "title": "Noraidīt uzaicinājumu"
-    },
     "report_content": {
         "description": "Ziņojuma par šo ziņu iesniegšana nosūtīs tās neatkārtojamo notikuma identifikatoru mājasservera pārvaldniekam. Ja ziņas šajā istabā ir šifrētas, mājasservera pārvaldnieks nevarēs lasīt ziņas saturu vai skatīt jebkādas datnes vai attēlus.",
         "disagree": "Nepiekrist",
@@ -1754,7 +1717,6 @@
             "you_created": "Tu izveidoji šo istabu."
         },
         "invite_email_mismatch_suggestion": "Kopīgojiet šo e-pastu sadaļā Iestatījumi, lai saņemtu ielūgumus tieši uz %(brand)s.",
-        "invite_reject_ignore": "Noraidīt un neņemt vērā lietotāju",
         "invite_sent_to_email": "Šis uzaicinājums tika nosūtīts uz %(email)s",
         "invite_sent_to_email_room": "Šis uzaicinājums uz %(roomName)s tika nosūtīts %(email)s",
         "invite_subtitle": "<userName/> uzaicināja Tevi",
@@ -2259,7 +2221,6 @@
             "remove_msisdn_prompt": "Dzēst %(phone)s?",
             "spell_check_locale_placeholder": "Izvēlieties lokalizāciju"
         },
-        "image_thumbnails": "Rādīt attēlu priekšskatījumus/sīktēlus",
         "inline_url_previews_default": "Iespējot URL priekšskatījumus pēc noklusējuma",
         "inline_url_previews_room": "Iespējot URL priekšskatījumus pēc noklusējuma visiem šīs istabas dalībniekiem",
         "inline_url_previews_room_account": "Iespējot URL priekšskatījumus šajā istabā (ietekmē tikai Tevi)",
@@ -2395,54 +2356,17 @@
         "prompt_invite": "Pārjautāt pirms uzaicinājuma nosūtīšanas potenciāli nederīgiem matrix ID",
         "replace_plain_emoji": "Automātiski aizstāt vienkāršā teksta emocijzīmes",
         "security": {
-            "4s_public_key_in_account_data": "konta datos",
-            "4s_public_key_status": "Slepenās krātuves publiskā atslēga:",
             "analytics_description": "Kopīgojiet anonīmus datus, lai palīdzētu mums noteikt problēmas. Nekā personīga. Trešās personas nav iesaistītas..",
-            "backup_key_cached_status": "Rezerves atslēga kešatmiņā:",
-            "backup_key_stored_status": "Rezerves atslēga saglabāta:",
-            "backup_key_unexpected_type": "negaidīts veids",
-            "backup_key_well_formed": "labi veidots",
-            "backup_keys_description": "Izveido savu šifrēšanas atslēgu rezerves kopijas ar sava konta datiem gadījumam, ja tiek zaudēta piekļuve savām sesijām. Atslēgas tiks aizsargātas ar neatkārtojamu drošības atslēgu.",
             "bulk_options_accept_all_invites": "Pieņemt visus %(invitedRooms)s uzaicinājumus",
             "bulk_options_reject_all_invites": "Noraidīt visus %(invitedRooms)s uzaicinājumus",
             "bulk_options_section": "Apjoma iespējas",
-            "cross_signing_cached": "lokāli saglabāts kešatmiņā",
-            "cross_signing_homeserver_support": "Mājasservera iespēju atbalsts:",
-            "cross_signing_homeserver_support_exists": "pastāv",
-            "cross_signing_in_4s": "slepenā krātuvē",
-            "cross_signing_in_memory": "atmiņā",
-            "cross_signing_master_private_Key": "Galvenā privātā atslēga:",
-            "cross_signing_not_cached": "nav atrasts lokāli",
-            "cross_signing_not_found": "nav atrasts",
-            "cross_signing_not_in_4s": "nav atrodams krātuvē",
-            "cross_signing_not_stored": "netiek uzglabāta",
-            "cross_signing_private_keys": "Savstarpējas parakstīšanas privātās atslēgas:",
-            "cross_signing_public_keys": "Savstarpējas parakstīšanas publiskās atslēgas:",
-            "cross_signing_self_signing_private_key": "Pašparaksta privātā atslēga:",
-            "cross_signing_user_signing_private_key": "Lietotāja paraksta privātā atslēga:",
-            "cryptography_section": "Kriptogrāfija",
-            "delete_backup": "Izdzēst rezerves kopiju",
-            "delete_backup_confirm_description": "Vai tiešām? Tiks zaudētas visas Tavas šifrētās ziņas, ja Tavām atslēgām nav pienācīgi veikta rezerves kopēšana.",
             "e2ee_default_disabled_warning": "Jūsu servera administrators pēc noklusējuma ir atspējojis pilnīgu šifrēšanu privātajās istabās un tiešajos ziņās.",
             "enable_message_search": "Iespējot ziņu meklēšanu šifrētās istabās",
             "encryption_section": "Šifrēšana",
-            "error_loading_key_backup_status": "Nevar ielādēt atslēgas rezerves kopijas statusu",
-            "export_megolm_keys": "Eksportēt istabas šifrēšanas atslēgas",
             "ignore_users_empty": "Nav vērā neņemtu lietotāju.",
             "ignore_users_section": "Vērā neņemtie lietotāji",
-            "import_megolm_keys": "Importēt E2E istabas atslēgas",
-            "key_backup_active": "Šī sesija veido jūsu atslēgas rezerves kopijas.",
-            "key_backup_active_version": "Aktīvā rezerves kopijas versija:",
-            "key_backup_active_version_none": "Neviena",
             "key_backup_algorithm": "Algoritms:",
-            "key_backup_can_be_restored": "Šo rezerves kopiju var atjaunot šajā sesijā",
-            "key_backup_complete": "Visas atslēgas ir dublētas",
             "key_backup_connect": "Savienojiet šo sesiju ar atslēgu dublēšanu",
-            "key_backup_connect_prompt": "Pirms izrakstīšanās savienojiet šo sesiju ar atslēgu dublējumu, lai nepazaudētu atslēgas, kas var būt pieejamas tikai šajā sesijā.",
-            "key_backup_in_progress": "Veido %(sessionsRemaining)s atslēgu rezerves kopijas…",
-            "key_backup_inactive": "Šī sesija <b>nedublē jūsu atslēgas</b>, bet jums ir esošs dublējums, no kura varat atjaunot un pievienot turpmākajai darbībai.",
-            "key_backup_inactive_warning": "Jūsu atslēgas <b>netiek dublētas no šīs sesijas</b>.",
-            "key_backup_latest_version": "Jaunākā rezerves kopijas versija serverī:",
             "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": {
@@ -2463,13 +2387,7 @@
             "message_search_unsupported": "%(brand)s trūkst dažu komponentu, kas nepieciešami šifrētu ziņu drošai glabāšanai lokālā kešatmiņā. Ja vēlaties eksperimentēt ar šo funkciju, uzbūvejiet pielāgotu %(brand)s Desktop ar <nativeLink>pievienotiem meklēšanas komponentiem</nativeLink> .",
             "message_search_unsupported_web": "%(brand)s nevar droši glabāt lokālā kešatmiņā šifrētas ziņas, darbojoties tīmekļa pārlūkprogrammā. Izmantojiet <desktopLink>%(brand)s Desktop</desktopLink>, lai šifrēti ziņojumi tiktu parādīti meklēšanas rezultātos.",
             "record_session_details": "Klienta nosaukuma, versijas un URL ierakstīšana palīdz vieglāk atpazīt sesijas sesiju pārvaldniekā",
-            "restore_key_backup": "Atjaunot no rezerves kopijas",
-            "secret_storage_not_ready": "nav gatavs",
-            "secret_storage_ready": "gatavs",
-            "secret_storage_status": "Slepenā krātuve:",
             "send_analytics": "Sūtīt analītikas datus",
-            "session_id": "Sesijas ID:",
-            "session_key": "Sesijas atslēga:",
             "strict_encryption": "Nekad šajā sesijā nesūtīt šifrētas ziņas neapliecinātām sesijām"
         },
         "send_read_receipts": "Sūtīt lasīšanas apliecinājumus",
@@ -2711,8 +2629,6 @@
         "topic": "Nolasa vai iestata istabas tematu",
         "topic_none": "Istabai nav temata.",
         "topic_room_error": "Neizdevās iegūt istabas tēmu: Nevar atrast istabu (%(roomId)s",
-        "tovirtual": "Pārslēdzas uz šīs istabas virtuālo istabu, ja tāda pastāv",
-        "tovirtual_not_found": "Šai istabai nav virtuālas istabas",
         "unban": "Atceļ pieejas liegumu lietotājam ar norādīto id",
         "unflip": "Pievieno ┬──┬ ノ( ゜-゜ノ) pirms vienkārša teksta ziņas",
         "unholdcall": "Šajā istabā iepauzētās sazvana atpauzēšana",
@@ -2835,7 +2751,6 @@
         "heading_with_query": "Izmantot \"%(query)s\" meklēšanai",
         "heading_without_query": "Meklēt",
         "keyboard_scroll_hint": "Lietojiet <arrows/> ritināšanai",
-        "message_search_section_title": "Citi meklējumi",
         "other_rooms_in_space": "Citas istabas %(spaceName)s",
         "public_rooms_label": "Publiskas istabas",
         "public_spaces_label": "Publiskās telpas",
@@ -2844,7 +2759,6 @@
         "remove_filter": "Noņemt meklēšanas filtru %(filter)s",
         "result_may_be_hidden_privacy_warning": "Daži rezultāti var būt slēpti dēļ privātuma",
         "result_may_be_hidden_warning": "Atsevišķi rezultāti var būt slēpti",
-        "search_messages_hint": "Lai meklētu ziņas, istabas augšpusē meklējiet šo ikonu <icon/>",
         "spaces_title": "Telpas, kurās atrodaties",
         "start_group_chat_button": "Uzsākt grupas tērzēšanu"
     },
diff --git a/src/i18n/strings/mg_MG.json b/src/i18n/strings/mg_MG.json
index fd8c8bf1b8..1ec5ed76c5 100644
--- a/src/i18n/strings/mg_MG.json
+++ b/src/i18n/strings/mg_MG.json
@@ -92,7 +92,6 @@
         "react": "Mamaly",
         "refresh": "Mamelombelona",
         "register": "Rejisitry",
-        "reject": "Tsy ilaina",
         "reload": "Avereno",
         "remove": "Esorina",
         "rename": "Hanova anarana",
@@ -425,7 +424,6 @@
         "capabilities": "Fahaizana",
         "copied": "Adika!",
         "credits": "Fahana",
-        "cross_signing": "Sonia mifandraika",
         "dark": "Maizina",
         "description": "Famaritana",
         "deselect_all": "Esory ny zava-drehetra",
@@ -792,44 +790,23 @@
     "empty_room_was_name": "Efitra banga (dia%(oldName)s )",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Ampidiro ny fehezan-teny fiarovana anao na<button> ampiasao ny Security Key</button> hanohy.",
             "key_validation_text": {
-                "invalid_security_key": "Fanalahidy fiarovana tsy mety",
-                "recovery_key_is_correct": "Toa tsara!",
-                "wrong_file_type": "Karazana rakitra diso",
                 "wrong_security_key": "Fanalahidin'ny fiarovana diso"
             },
-            "reset_title": "Avereno ny zava-drehetra",
-            "reset_warning_1": "Ataovy izany raha tsy manana fitaovana hafa hamitana ny fanamarinana ianao.",
-            "reset_warning_2": "Raha averinao daholo ny zava-drehetra dia hanomboka tsy misy fivoriana azo itokisana, tsy misy mpampiasa azo itokisana, ary mety tsy hahita hafatra taloha.",
             "restoring": "Famerenana ny fanalahidy avy amin'ny vakorakitra",
-            "security_key_title": "Kitendry fiarovana",
-            "security_phrase_incorrect_error": "Tsy afaka miditra amin'ny fitahirizana miafina. Azafady, hamarino fa nampiditra ny fehezan-teny fiarovana marina ianao.",
-            "security_phrase_title": "Andian-teny fiarovana",
-            "separator": "%(securityKey)sna%(recoveryFile)s",
-            "use_security_key_prompt": "Ampiasao ny lakilen'ny fiarovana anao hanohizana."
+            "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_not_ready": "Tsy tafapetraka ny fanaovana sonia.",
-        "cross_signing_ready": "Vonona hampiasaina ny fanaovan-tsonia.",
-        "cross_signing_ready_no_backup": "Efa vonona ny fanaovan-tsonia fa ny fanalahidy dia tsy averina.",
         "cross_signing_room_normal": "Ity efitrano ity dia misy encryption avy hatrany",
         "cross_signing_room_verified": "Ny olona rehetra ao amin'ity efitrano ity dia voamarina",
         "cross_signing_room_warning": "Misy mpampiasa zotra tsy fantatra",
-        "cross_signing_unsupported": "Ny homeserver-nao dia tsy mahazaka sonia.",
-        "cross_signing_untrusted": "Ny kaontinao dia manana mari-pamantarana mifanipaka aminy fitahirizana miafina, saingy tsy mbola atokisan'ity fivoriana ity.",
         "cross_signing_user_normal": "Tsy nanamarina ity mpampiasa ity ianao.",
         "cross_signing_user_verified": "Efa nanamarina ity mpampiasa ity ianao. Ity mpampiasa ity dia nanamarina ny fotoam-pivorian'izy ireo rehetra.",
         "cross_signing_user_warning": "Ity mpampiasa ity dia tsy nanamarina ny fotoam-pivoriana rehetra.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Fafao ny fanalahidiny fifanekena",
-            "title": "Potehina ny fanalahidin'ny fanaovan-tsonia?",
-            "warning": "Ny famafana ny fanalahidiny fifanekena dia maharitra. Na iza na iza nohamarininao dia hahita fampandrenesana fiarovana. Azo antoka fa tsy te hanao izany ianao, raha tsy hoe very ny fitaovana rehetra azonao anaovana sonia."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Tsy azo antoka amin'ity fitaovana ity ny mahazo itokiana an'ity hafatra miafina ity.",
         "event_shield_reason_mismatched_sender_key": "Encrypted amin&#39;ny zotra tsy voamarina",
         "event_shield_reason_unknown_device": "Avy aminy olona tsy fantatra na hofafana",
@@ -852,7 +829,6 @@
             "title": "Fomba fanarenana vaovao",
             "warning": "Raha tsy nametraka ny fomba fanarenana vaovao ianao dia mety manandrana miditra amin'ny kaontinao ny mpanafika. Hanova ny tenimiafiny kaontinao ary mametraha fomba fanarenana vaovao avy hatrany ao aminy fanitsiana."
         },
-        "not_supported": "<not supported>",
         "recovery_method_removed": {
             "description_1": "Ity fotoam-pivoriana ity dia nahita fa nesorina ny fehezan-teny fiarovana sy ny fanalahidy hoany fiarovana hafatra.",
             "description_2": "Raha nanao izany tsy nahy ianao dia azonao atao ny manangana fiarovana zotra amin'ity zotra ity izay hanasivana indray ny tantarany hafatra amin'ity zotra ity miaraka amin'ny fomba fanarenana vaovao.",
@@ -863,8 +839,7 @@
         "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.",
-            "title": "Manangana"
+            "explainer": "Amboary ny fanalahidinao alohany hivoahana mba tsy ho very."
         },
         "udd": {
             "interactive_verification_button": "Hamarino amin'ny alalany emoji",
@@ -879,7 +854,6 @@
             "accepting": "Manaiky…",
             "after_new_login": {
                 "device_verified": "Voamarina ny fitaovana",
-                "reset_confirmation": "Avereno tokoa ny fanalahidiny fanamarinana?",
                 "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"
@@ -949,8 +923,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_reset_warning_1": "Tsy azo atao ny mamerina ny fanalahidiny fanamarinanao. Aoriany famerenanao dia tsy ho afaka miditra amin'ny hafatra miafina taloha ianao, ary izay namana nanamarina anao teo aloha dia hahita fampitandremana momba ny fiarovana mandra-panamarinanao azy ireo indray.",
-            "verify_reset_warning_2": "Tohizo ihany azafady raha azonao antoka fa very daholo ny fitaovanao hafa rehetra sy ny Key Security.",
             "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",
@@ -1008,11 +980,7 @@
             "title": "Tsy afaka mandika ny rohiny efitrano"
         },
         "error_loading_user_profile": "Tsy afaka mampiditra ny mombamomba ny mpampiasa",
-        "forget_room_failed": "Tsy nanadino ny efitrano%(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Mety tsy misy ny mpizara, be loatra, na tapitra ny fotoana fikarohana :(",
-            "title": "Tsy nahomby ny fikarohana"
-        }
+        "forget_room_failed": "Tsy nanadino ny efitrano%(errCode)s"
     },
     "error_user_not_logged_in": "Tsy tafiditra ny mpampiasa",
     "event_preview": {
@@ -1623,11 +1591,6 @@
         "ongoing": "Manala ...",
         "reason_label": "Antony (tsy voatery)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Tena te handà ny fanasana ve ianao?",
-        "failed": "Tsy nanda ny fanasana",
-        "title": "Laviny ny fanasana"
-    },
     "report_content": {
         "description": "Ny tatitra an'ity hafatra ity dia handefa ny event ID azy manokana any amin'ny mpitantana ny homeserver-nao. Raha misy encryption ny hafatra ao amin'ity efitrano ity dia tsy afaka mamaky ny lahatsoratra na mijery rakitra na sary ny mpitantana ny homeserver anao.",
         "disagree": "Tsy miombon-kevitra",
@@ -1808,7 +1771,6 @@
             "you_created": "Ianao no namorona ity efitrano ity."
         },
         "invite_email_mismatch_suggestion": "Zarao amin'ny fanitsiana ity mailaka ity mba handraisana fanasana mivantana%(brand)s.",
-        "invite_reject_ignore": "Mandà tsy miraharaha ny mpampiasa",
         "invite_sent_to_email": "Nalefa tany amin'ny%(email)s",
         "invite_sent_to_email_room": "Invitation to%(roomName)s nalefa tany%(email)s",
         "invite_subtitle": "<userName/>nanasa anao",
@@ -2326,7 +2288,6 @@
             "remove_msisdn_prompt": "Esory%(phone)s ?",
             "spell_check_locale_placeholder": "Misafidiana toerana iray"
         },
-        "image_thumbnails": "Asehoy ny topi-maso/sary kely hoan'ny sary",
         "inline_url_previews_default": "Alefaso ny fijerena URL an-tserasera aminy alàlan'ny default",
         "inline_url_previews_room": "Alefaso amin'ny alàlany ara-pototra hoany mpandray anjara amin'ity efitrano ity ny fijerena URL",
         "inline_url_previews_room_account": "Alefaso ny fijerena URL ho an'ity efitrano ity (miantraika aminao ihany)",
@@ -2462,54 +2423,17 @@
         "prompt_invite": "Alefaso alohan'ny handefasana fanasana amin'ny ID mety tsy mety",
         "replace_plain_emoji": "Soloy ho azy ny Emoji soratra tsotra",
         "security": {
-            "4s_public_key_in_account_data": "Ao amin'ny kaonty angona",
-            "4s_public_key_status": "Tsiambaratelo ho an'ny daholobe:",
             "analytics_description": "Mizarà angona tsy mitonona anarana hanampiana anay hamantatra olana. Tsy misy zavatra manokana. Tsy misy antoko fahatelo.",
-            "backup_key_cached_status": "Fanalahidin'ny vakorakitra voatahiry:",
-            "backup_key_stored_status": "Fanalahidin'ny vakorakitra voatahiry:",
-            "backup_key_unexpected_type": "karazana tsy ampoizina",
-            "backup_key_well_formed": "miforona tsara",
-            "backup_keys_description": "Avereno miaraka amin'ny angony kaontinao ny fanalahidin'ny fanafenanao raha toa ka very ny fidirana amin'ny fotoam-pivorianao. Ny fanalahidinao dia ho voaro aminy fanalahidin'ny vakorakitra tokana.",
             "bulk_options_accept_all_invites": "Ekeo daholo%(invitedRooms)s fanasana",
             "bulk_options_reject_all_invites": "Mandà daholo%(invitedRooms)s fanasana",
             "bulk_options_section": "Safidin'ny ampahany",
-            "cross_signing_cached": "cache eo an-toerana",
-            "cross_signing_homeserver_support": "Fanohanana endri-javatra Homeserver:",
-            "cross_signing_homeserver_support_exists": "misy",
-            "cross_signing_in_4s": "amin'ny fitahirizana miafina",
-            "cross_signing_in_memory": "amin'ny fahatsiarovana",
-            "cross_signing_master_private_Key": "Fanalahidy mahaleo tena manokana",
-            "cross_signing_not_cached": "Tsy hita eo an-toerana",
-            "cross_signing_not_found": "tsy hita",
-            "cross_signing_not_in_4s": "tsy hita ao anaty fitahirizana",
-            "cross_signing_not_stored": "Tsy voatahiry",
-            "cross_signing_private_keys": "Fanalahidy manokana fanaovana sonia:",
-            "cross_signing_public_keys": "Fanalahidin'ny daholobe fanaovana sonia:",
-            "cross_signing_self_signing_private_key": "Fanasoniavana manokana fanalahidy:",
-            "cross_signing_user_signing_private_key": "Mpisera manao sonia ny kitendry manokana:",
-            "cryptography_section": "Cryptografika",
-            "delete_backup": "Fafao ny vakorakitra",
-            "delete_backup_confirm_description": "Azonao antoka ve izany? Ho very ny hafatrao voasakana raha tsy voalamina tsara ny fanalahidinao.",
             "e2ee_default_disabled_warning": "Nosakanan'ny admin server-nao ny encryption aminy alàlany default ao aminy efitrano manokana Hafatra mivantana.",
             "enable_message_search": "Alefaso ny fikarohana hafatra ao amin'ny efitrano misy miafina",
             "encryption_section": "Fanafenana",
-            "error_loading_key_backup_status": "Tsy afaka mampiditra ny satany fanalahidin'ny vakorakitra",
-            "export_megolm_keys": "Manondrana fanalahidin'ny efitrano E2E",
             "ignore_users_empty": "Tsy manana mpampiasa tsy noraharahiana ianao.",
             "ignore_users_section": "Ireo mpampiasa tsy noraharahiana",
-            "import_megolm_keys": "Ampidiro ny fanalahidin'ny efitrano E2E",
-            "key_backup_active": "Ity zotra ity dia manohana ny fanalahidinao.",
-            "key_backup_active_version": "Ekeo vakorakitra ho solon'izay dikan:",
-            "key_backup_active_version_none": "Tsy misy",
             "key_backup_algorithm": "Algorithm:",
-            "key_backup_can_be_restored": "Ity vakorakitra ity dia azo averina amin'ity zotra ity",
-            "key_backup_complete": "Ny lakile rehetra dia naverina",
             "key_backup_connect": "Ampifandraiso amin'ny fanalahidin'ny vakorakitra ity fivoriana ity",
-            "key_backup_connect_prompt": "Ampifandraiso amin'ny fanalahidin'ny vakorakitra ity zotra ity alohany hivoahana mba tsy ho very izay fanalahidy mety ho ao amin'ity session ity ihany.",
-            "key_backup_in_progress": "Vakorakitra%(sessionsRemaining)s fanalahidy…",
-            "key_backup_inactive": "Ity session ity dia<b> tsy manohana ny fanalahidinao</b> , fa manana vakorakitra efa misy azonao averina ary ampiana amin'ny fandrosoana.",
-            "key_backup_inactive_warning": "Ny fanalahidinao dia<b> tsy naverina tamin'ity fivoriana ity</b>.",
-            "key_backup_latest_version": "Dika vakorakitra farany amin'ny mpizara:",
             "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": {
@@ -2529,13 +2453,7 @@
             "message_search_unsupported": "%(brand)stsy ampy ny singa sasany ilaina amin'ny fikojakojana ny hafatra miafina ao an-toerana. Raha te hanandrana an'io endri-javatra io ianao dia manangana fomba fanao%(brand)s Desktop miaraka amin'ny<nativeLink> nampiana singa fikarohana</nativeLink> .",
             "message_search_unsupported_web": "%(brand)stsy afaka mitahiry tsara ireo hafatra voafefy eo an-toerana raha mandeha amin'ny toeram-pivohizana web. Ampiasao<desktopLink>%(brand)s biraonao</desktopLink> mba hiseho amin&#39;ny valin&#39;ny fikarohana ireo hafatra voafefy.",
             "record_session_details": "Raketo ny anaran'ny mpanjifa, ny dikan-teny ary ny url mba hamantarana mora kokoa ny fotoam-pivoriana ao aminy mpitantana fivoriana",
-            "restore_key_backup": "Avereno amin'ny vakorakitra",
-            "secret_storage_not_ready": "Tsy vonona",
-            "secret_storage_ready": "Vonona",
-            "secret_storage_status": "Fitehirizana tsiambaratelo:",
             "send_analytics": "Mandefasa angona fitiliana",
-            "session_id": "ID fivoriana:",
-            "session_key": "Fanalahidin'ny fivoriana:",
             "strict_encryption": "Aza mandefa hafatra miafina mihitsy amin'ireo fivoriana tsy voamarina avy amin'ity fivoriana ity"
         },
         "send_read_receipts": "Mandefa ny rosia voapanga novakiana",
@@ -2764,8 +2682,6 @@
         "topic": "Mahazo na farito ny lohahevitra ny efitrano",
         "topic_none": "Tsy misy lohahevitra ity efitrano ity.",
         "topic_room_error": "Tsy tontonsa ny fahazoana efitrano ho lohahevitra. Tsy misy làlana mety hahazoana efitrano( %(numéro de pièce)s",
-        "tovirtual": "Mivadika any amin'ny efitrano virtoaly an'ity efitrano ity, raha misy izany",
-        "tovirtual_not_found": "Tsy misy efitrano virtoaly ho an'ity efitrano ity",
         "unban": "Avereno ny mpampiasa manana ID nomena",
         "unflip": "Manisy ┬──┬ ノ( ゜-゜ノ) amin'ny hafatra an-tsoratra tsotra",
         "unholdcall": "Esory ny antso ao amin'ny efitrano misy ankehitriny",
@@ -2887,7 +2803,6 @@
         "heading_without_query": "Hitady ny",
         "join_button_text": "anjara%(roomAddress)s",
         "keyboard_scroll_hint": "Ampiasao<arrows/> ny horonan-taratasy",
-        "message_search_section_title": "Fikarohana hafa",
         "other_rooms_in_space": "Efitrano hafa ao%(spaceName)s",
         "public_rooms_label": "Efitranom-bahoaka",
         "public_spaces_label": "Toeram-bahoaka",
@@ -2897,7 +2812,6 @@
         "result_may_be_hidden_privacy_warning": "Mety hafenina hoany fiainana manokana ny valiny sasany",
         "result_may_be_hidden_warning": "Mety hafenina ny valiny sasany",
         "search_dialog": "Fikarohana Dialog",
-        "search_messages_hint": "Raha hikaroka hafatra dia tadiavo ity kisary ity eo an-tampon'ny efitrano iray<icon/>",
         "spaces_title": "Toerana misy anao",
         "start_group_chat_button": "Manomboha resaka vondrona"
     },
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index d9fd348b80..eade6ba1d2 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -9,9 +9,19 @@
         },
         "n_unread_messages_mentions": {
             "one": "1 ulest omtale.",
-            "other": "%(count)s uleste meldinger, inkludert omtaler."
+            "other": "%(count)s uleste meldinger inkludert der du nevnes."
         },
         "recent_rooms": "Nylige rom",
+        "room_messsage_not_sent": "Åpent rom %(roomName)s med en usendt melding.",
+        "room_n_unread_invite": "Invitasjon til det åpne rommet %(roomName)s.",
+        "room_n_unread_messages": {
+            "one": "Åpne room %(roomName)s med 1 ulest message.",
+            "other": "Åpne room %(roomName)s med %(count)s uleste messages."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Åpne room %(roomName)s med 1 ulest omtale.",
+            "other": "Åpne room %(roomName)s med %(count)s uleste meldinger inkludert omtaler."
+        },
         "room_name": "Rom %(name)s",
         "room_status_bar": "Statuslinje for rommet",
         "seek_bar_label": "Søkelinje for lyd",
@@ -45,6 +55,8 @@
         "create_a_room": "Opprett rom",
         "create_account": "Opprett konto",
         "decline": "Avslå",
+        "decline_and_block": "Avvise og blokkere",
+        "decline_invite": "Avvis invitasjon",
         "delete": "Slett",
         "deny": "Avvis",
         "disable": "Slå av",
@@ -97,7 +109,6 @@
         "react": "Reager",
         "refresh": "Oppdater",
         "register": "Registrer",
-        "reject": "Avvis",
         "reload": "Last inn på nytt",
         "remove": "Fjern",
         "rename": "Gi nytt navn",
@@ -146,6 +157,7 @@
         "view_message": "Se melding",
         "view_source": "Vis kilde",
         "yes": "Ja",
+        "yes_dismiss": "Ja, avvis",
         "zoom_in": "Forstørr",
         "zoom_out": "Forminske"
     },
@@ -375,6 +387,7 @@
             "fallback_button": "Begynn autentisering",
             "mas_cross_signing_reset_cta": "Gå til kontoen din",
             "mas_cross_signing_reset_description": "Tilbakestill identiteten din gjennom kontoleverandøren din, og kom deretter tilbake og klikk \"Prøv på nytt\".",
+            "mas_cross_signing_reset_title": "Gå til kontoen din for å tilbakestille identiteten din",
             "msisdn": "En SMS har blitt sendt til %(msisdn)s",
             "msisdn_token_incorrect": "Sjetongen er feil",
             "msisdn_token_prompt": "Vennligst skriv inn koden den inneholder:",
@@ -476,7 +489,6 @@
         "capabilities": "Evner",
         "copied": "Kopiert!",
         "credits": "Takk til",
-        "cross_signing": "Kryssignering",
         "dark": "Mørk",
         "description": "Beskrivelse",
         "deselect_all": "Fravelg alle",
@@ -515,6 +527,7 @@
         "message_timestamp_invalid": "Ugyldig tidsstempel",
         "microphone": "Mikrofon",
         "model": "Modell",
+        "moderation_and_safety": "Moderasjon og sikkerhet",
         "modern": "Moderne",
         "mute": "Demp",
         "n_members": {
@@ -736,6 +749,13 @@
         "twemoji": "Emoji-grafikken <twemoji>Twemoji</twemoji> er © av <author>Twitter, Inc og andre bidragsytere</author> og brukt under vilkårene i <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Fonten <colr>twemoji-colr</colr> er © <author>Mozilla Foundation</author> kan brukes under vilkårene i <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Er du sikker på at du vil takke nei til invitasjonen om å bli med i \"%(roomName)s\"?",
+        "ignore_user_help": "Du vil ikke se noen meldinger eller rominvitasjoner fra denne brukeren.",
+        "reason_description": "Beskriv årsaken for å rapportere rommet.",
+        "report_room_description": "Rapporter dette rommet til din kontoleverandør.",
+        "title": "Avvis invitasjon"
+    },
     "desktop_default_device_name": "%(brand)sSkrivebordet: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktive moduler",
@@ -836,6 +856,9 @@
         "setting_colon": "Innstilling:",
         "setting_definition": "Innstillingsdefinisjon:",
         "setting_id": "Innstillings-ID",
+        "settings": {
+            "elementCallUrl": "Element Call URL"
+        },
         "settings_explorer": "Utforsker for innstillinger",
         "show_hidden_events": "Vis skjulte hendelser i tidslinjen",
         "spaces": {
@@ -888,44 +911,25 @@
     "empty_room_was_name": "Tomt rom (var %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Skriv inn sikkerhetsfrasen eller <button> bruk sikkerhetsnøkkelen </button> for å fortsette.",
+            "alternatives": "Hvis du har en sikkerhetsnøkkel eller en sikkerhetsfrase, vil dette også fungere.",
             "key_validation_text": {
-                "invalid_security_key": "Ugyldig gjenopprettingsnøkkel",
-                "recovery_key_is_correct": "Ser bra ut!",
-                "wrong_file_type": "Feil filtype",
-                "wrong_security_key": "Feil gjenopprettingsnøkkel"
+                "wrong_security_key": "Gjenopprettingsnøkkelen du skrev inn er ikke riktig."
             },
-            "reset_title": "Tilbakestill alt",
-            "reset_warning_1": "Gjør dette bare hvis du ikke har noen annen enhet å fullføre verifiseringen med.",
-            "reset_warning_2": "Hvis du tilbakestiller alt, starter du på nytt uten klarerte økter, ingen klarerte brukere, og du kan kanskje ikke se tidligere meldinger.",
+            "privacy_warning": "Sørg for at ingen kan se denne skjermen!",
             "restoring": "Gjenoppretter nøkler fra sikkerhetskopi",
-            "security_key_title": "Gjenopprettingsnøkkel",
-            "security_phrase_incorrect_error": "Får ikke tilgang til hemmelig lagring. Kontroller at du har skrevet inn riktig sikkerhetsfrase.",
-            "security_phrase_title": "Sikkerhetsfrase",
-            "separator": "%(securityKey)s eller %(recoveryFile)s",
-            "use_security_key_prompt": "Bruk sikkerhetsnøkkelen din for å fortsette."
+            "security_key_title": "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_not_ready": "Krysssignering er ikke satt opp.",
-        "cross_signing_ready": "Krysssignering er klar til bruk.",
-        "cross_signing_ready_no_backup": "Krysssignering er klar, men nøkler er ikke sikkerhetskopiert.",
         "cross_signing_room_normal": "Dette rommet er ende-til-ende-kryptert",
         "cross_signing_room_verified": "Alle i dette rommet er verifisert",
         "cross_signing_room_warning": "Noen bruker en ukjent sesjon",
-        "cross_signing_unsupported": "Hjemmeserveren din støtter ikke krysssignering.",
-        "cross_signing_untrusted": "Kontoen din har en kryssigneringsidentitet i hemmelig lagring, men den er ennå ikke klarert av denne økten.",
         "cross_signing_user_normal": "Du har ikke bekreftet denne brukeren.",
         "cross_signing_user_verified": "Du har bekreftet denne brukeren. Denne brukeren har bekreftet alle sesjonene sine.",
         "cross_signing_user_warning": "Denne brukeren har ikke bekreftet alle sesjonene sine.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Fjern nøkler for krysssignering",
-            "title": "Ødelegge krysssigneringsnøkler?",
-            "warning": "Det er permanent å slette krysssigneringsnøkler. Alle du har bekreftet med vil se sikkerhetsvarsler. Du vil nesten helt sikkert ikke gjøre dette, med mindre du har mistet alle enheter du kan krysssignere fra."
-        },
         "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_key": "Kryptert av en uverifisert sesjon",
@@ -952,7 +956,6 @@
             "title": "Ny gjenopprettingsmetode",
             "warning": "Hvis du ikke har angitt den nye gjenopprettingsmetoden, kan det hende at en hacker prøver å få tilgang til kontoen din. Du må øyeblikkelig endre passordet for kontoen din og angi en ny gjenopprettingsmetode i Innstillinger."
         },
-        "not_supported": "<not supported>",
         "pinned_identity_changed": "%(displayName)ss (<b>%(userId)s</b>) identitet ser ut til å ha endret seg. <a>Finn ut mer</a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>s identitet ble tilbakestilt. <a>Finn ut mer</a>",
         "recovery_method_removed": {
@@ -968,9 +971,10 @@
         "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.",
-            "title": "Sett opp"
+            "explainer": "Ta sikkerhetskopi av nøklene dine før du logger av for å unngå å miste dem."
         },
+        "turn_on_key_storage": "Slå på nøkkeloppbevaring",
+        "turn_on_key_storage_description": "Lagre din kryptografiske identitet og nøkler til meldinger sikkert på serveren. Dette gjør at du kan se historikken for meldinger på alle nye enheter.",
         "udd": {
             "interactive_verification_button": "Interaktiv verifisering ved hjelp av emoji",
             "other_ask_verify_text": "Be denne brukeren om å bekrefte sesjonen sin, eller bekreft den manuelt nedenfor.",
@@ -984,7 +988,6 @@
             "accepting": "Aksepterer …",
             "after_new_login": {
                 "device_verified": "Enhet verifisert",
-                "reset_confirmation": "Vil du virkelig tilbakestille bekreftelsesnøkler?",
                 "skip_verification": "Hopp over verifisering for nå",
                 "unable_to_verify": "Kan ikke verifisere denne enheten",
                 "verify_this_device": "Verifiser denne enheten"
@@ -1055,8 +1058,6 @@
             "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_reset_warning_1": "Tilbakestilling av bekreftelsesnøklene kan ikke angres. Etter tilbakestilling har du ikke tilgang til gamle krypterte meldinger, og eventuelle venner som tidligere har bekreftet deg, vil se sikkerhetsadvarsler til du bekrefter med dem på nytt.",
-            "verify_reset_warning_2": "Fortsett bare hvis du er sikker på at du har mistet alle de andre enhetene og sikkerhetsnøkkelen din.",
             "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",
@@ -1125,11 +1126,7 @@
             "title": "Kan ikke kopiere romlenken"
         },
         "error_loading_user_profile": "Klarte ikke å laste inn brukerprofilen",
-        "forget_room_failed": "Kunne ikke glemme rommet %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Serveren kan være utilgjengelig, overbelastet eller søket ble tidsavbrutt :(",
-            "title": "Søket mislyktes"
-        }
+        "forget_room_failed": "Kunne ikke glemme rommet %(errCode)s"
     },
     "error_user_not_logged_in": "Brukeren er ikke logget inn",
     "event_preview": {
@@ -1664,6 +1661,7 @@
         "class_global": "Globalt",
         "class_other": "Andre",
         "default": "Standard",
+        "default_settings": "Match standardinnstillingene",
         "email_pusher_app_display_name": "E-postvarsler",
         "enable_prompt_toast_description": "Aktiver skrivebordsvarsler",
         "enable_prompt_toast_title": "Varsler",
@@ -1682,7 +1680,8 @@
         "mentions_and_keywords_description": "Bli varslet bare med omtaler og nøkkelord som konfigurert i <a> innstillingene dine </a>",
         "mentions_keywords": "Omtaler og nøkkelord",
         "message_didnt_send": "Meldingen ble ikke sendt. Klikk for informasjon.",
-        "mute_description": "Du vil ikke få noen varsler"
+        "mute_description": "Du vil ikke få noen varsler",
+        "mute_room": "Demp rommet"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s ber om verifisering"
@@ -1784,11 +1783,6 @@
         "ongoing": "Fjerner …",
         "reason_label": "Årsak (valgfritt)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Er du sikker på at du vil avvise invitasjonen?",
-        "failed": "Kunne ikke avvise invitasjonen",
-        "title": "Avslå invitasjonen"
-    },
     "report_content": {
         "description": "Rapportering av denne meldingen vil sende sin unike 'hendelses-ID' til administratoren av hjemmeserveren din. Hvis meldinger i dette rommet er kryptert, vil ikke hjemmeserveradministratoren kunne lese meldingsteksten eller se noen filer eller bilder.",
         "disagree": "Uenig",
@@ -1813,9 +1807,7 @@
     },
     "report_room": {
         "description": "Rapporter dette rommet til hjemmeserveradministratoren din. Dette vil sende rommets unike ID, men hvis meldinger er kryptert, vil ikke administratoren kunne lese dem eller se delte filer.",
-        "reason_placeholder": " Årsak til rapportering...",
-        "sent": "Rapporten din ble sendt.",
-        "title": "Rapporter rom"
+        "reason_label": "Beskriv årsaken"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Kunne ikke dekryptere %(failedCount)s økter!",
@@ -1965,6 +1957,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",
@@ -2000,7 +1993,6 @@
             "you_created": "Du opprettet dette rommet."
         },
         "invite_email_mismatch_suggestion": "Del denne e-posten i Innstillinger for å motta invitasjoner direkte i %(brand)s.",
-        "invite_reject_ignore": "Avslå og ignorer brukeren",
         "invite_sent_to_email": "Denne invitasjonen ble sendt til %(email)s",
         "invite_sent_to_email_room": "Denne invitasjonen %(roomName)s ble sendt til %(email)s",
         "invite_subtitle": "<userName/> inviterte deg",
@@ -2096,6 +2088,7 @@
             },
             "uploading_single_file": "Laster opp %(filename)s"
         },
+        "video_room": "Dette rommet er et videorom",
         "waiting_for_join_subtitle": "Når inviterte brukere har blitt med i %(brand)s, vil du kunne chatte og rommet vil bli ende-til-ende-kryptert",
         "waiting_for_join_title": "Venter på at brukerne skal bli med %(brand)s"
     },
@@ -2110,11 +2103,14 @@
             "no_chats_description_no_room_rights": "Kom i gang med å sende meldinger til noen",
             "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_mentions": "Du har ingen uleste omtaler",
             "no_people": "Du har ikke direkte chatter med noen ennå",
-            "no_people_description": "Du kan velge bort filtre for å se de andre chattene dine",
+            "no_people_description": "Du kan fjerne merket for filtre for å se de andre chattene dine",
             "no_rooms": "Du er ikke med i noen rom ennå",
-            "no_rooms_description": "Du kan velge bort filtre for å se de andre chattene dine",
+            "no_rooms_description": "Du kan fjerne merket for filtre for å se de andre chattene dine",
             "no_unread": "Gratulerer! Du har ingen uleste meldinger",
+            "show_activity": "Se alle aktiviteter",
             "show_chats": "Vis alle chatter"
         },
         "failed_add_tag": "Kunne ikke legge til tagg %(tagName)s til rom",
@@ -2122,9 +2118,12 @@
         "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",
-            "unread": "Ulest"
+            "unread": "Uleste"
         },
         "home_menu_label": "Hjem alternativer",
         "join_public_room_label": "Bli med i offentlig rom",
@@ -2152,15 +2151,20 @@
             "more_options": "Flere alternativer",
             "open_room": "Åpne rom %(roomName)s"
         },
+        "room_options": "Rominnstillinger",
         "show_less": "Vis mindre",
         "show_n_more": {
-            "one": "Vis %(count)s mer",
-            "other": "Vis %(count)s mer"
+            "Vis %(count)s til": "Vis %(count)s mer"
         },
         "show_previews": "Vis forhåndsvisninger av meldinger",
+        "sort": "Sorter",
         "sort_by": "Sorter etter",
         "sort_by_activity": "Aktivitet",
         "sort_by_alphabet": "A-Å",
+        "sort_type": {
+            "activity": "Aktivitet",
+            "atoz": "A-Å"
+        },
         "sort_unread_first": "Vis rom med uleste meldinger først",
         "space_menu": {
             "home": "Område hjem",
@@ -2448,6 +2452,10 @@
         "recent_changes_heading": "Nylige endringer som ennå ikke er mottatt",
         "title": "Serveren svarer ikke"
     },
+    "service_worker_error": {
+        "description": "%(brand)s krever en tjenestearbeider for å laste inn autentiserte medier fra Matrix-innholdslagre. Dette støttes ikke av nettleseren din, så du kan oppleve at media ikke lastes inn.",
+        "title": "Kunne ikke laste inn servicearbeider"
+    },
     "seshat": {
         "error_initialising": "Initialisering av meldingssøk mislyktes, sjekk innstillingene <a> dine </a> for mer informasjon",
         "reset_button": "Tilbakestill hendelseslageret",
@@ -2526,12 +2534,13 @@
                 "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_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.",
                 "details_title": "Krypteringsdetaljer",
                 "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": "I krypterte rom, må du ikke sende krypterte meldinger til noen før du har verifisert dem",
+                "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_label": "I krypterte rom, send kun meldinger til verifiserte brukere",
                 "other_people_device_title": "Andre personers enheter",
                 "reset_identity": "Tilbakestill kryptografisk identitet",
@@ -2540,10 +2549,12 @@
                 "session_key": "Sesjonsnøkkel:",
                 "title": "Avansert"
             },
+            "confirm_key_storage_off": "Er du sikker på at du vil ha nøkkeloppbevaring skrudd av?",
+            "confirm_key_storage_off_description": "Hvis du logger deg av alle enhetene dine, mister du meldingshistorikken og må bekrefte alle eksisterende kontakter igjen. <a>Lær mer </a>",
             "delete_key_storage": {
                 "breadcrumb_page": "Slett nøkkellagring",
                 "confirm": "Slett nøkkellagring",
-                "description": "Sletting av nøkkellagring vil fjerne din kryptografiske identitet og meldingsnøkler fra serveren og deaktivere følgende sikkerhetsfunksjoner:",
+                "description": "Hvis du sletter nøkkellagring, fjernes den kryptografiske identiteten og meldingsnøklene fra serveren og deaktivere følgende sikkerhetsfunksjoner:",
                 "list_first": "Du vil ikke ha kryptert meldingshistorikk på nye enheter",
                 "list_second": "Du vil miste tilgangen til de krypterte meldingene dine hvis du logger av %(brand)s overalt",
                 "title": "Er du sikker på at du vil slå av nøkkellagring og slette den?"
@@ -2554,7 +2565,7 @@
             "dialog_title": "<strong>Innstillinger:</strong> Kryptering",
             "key_storage": {
                 "allow_key_storage": "Tillat lagring av nøkler",
-                "description": "Lagre din kryptografiske identitet og meldingsnøkler sikkert på serveren. Dette gjør at du kan se meldingshistorikken din på alle nye enheter. <a>Lær mer om dette</a>",
+                "description": "Lagre din kryptografiske identitet og meldingsnøkler sikkert på serveren. Dette lar deg se meldingsloggen din på alle nye enheter. <a>Lær mer </a>",
                 "title": "Nøkkellager"
             },
             "recovery": {
@@ -2625,6 +2636,7 @@
             "discovery_needs_terms_title": "La folk finne deg",
             "display_name": "Visningsnavn",
             "display_name_error": "Kan ikke angi visningsnavn",
+            "email_adding_unsupported_by_hs": "Denne hjemmeserveren støtter ikke å legge til flere e-postadresser til kontoen din.",
             "email_address_in_use": "Denne e-postadressen er allerede i bruk",
             "email_address_label": "E-postadresse",
             "email_not_verified": "E-postadressen din er ikke verifisert ennå",
@@ -2649,7 +2661,9 @@
             "error_share_msisdn_discovery": "Kan ikke dele telefonnummer",
             "identity_server_no_token": "Ingen identitetstilgangstoken funnet",
             "identity_server_not_set": "Identitetsserver er ikke angitt",
+            "invalid_phone_number": "Telefonnummeret som er oppgitt ser ikke ut til å være gyldig.",
             "language_section": "Språk",
+            "msisdn_adding_unsupported_by_hs": "Denne hjemmeserveren støtter ikke å legge til telefonnumre til kontoen din.",
             "msisdn_in_use": "Dette mobilnummeret er allerede i bruk",
             "msisdn_label": "Telefonnummer",
             "msisdn_verification_field_label": "Verifikasjonskode",
@@ -2668,12 +2682,10 @@
             "unable_to_load_msisdns": "Kan ikke laste inn telefonnumre",
             "username": "Brukernavn"
         },
-        "image_thumbnails": "Vis forhåndsvisninger for bilder",
         "inline_url_previews_default": "Skru på URL-forhåndsvisninger inni meldinger som standard",
         "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_avatars": "Vis avatarer til rom du har blitt invitert til",
         "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).",
@@ -2732,6 +2744,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Innstillinger:</strong> Ignorerte brukere"
         },
+        "media_preview": {
+            "hide_avatars": "Skjul avatarer for rom og inviterer",
+            "hide_media": "Skjul alltid",
+            "media_preview_description": "Et skjult medium kan alltid vises ved å trykke på det",
+            "media_preview_label": "Vis media i tidslinjen",
+            "show_in_private": "I private rom",
+            "show_media": "Vis alltid"
+        },
         "notifications": {
             "default_setting_description": "Denne innstillingen vil bli brukt som standard for alle rommene dine.",
             "default_setting_section": "Jeg ønsker å bli varslet for (standardinnstilling)",
@@ -2817,57 +2837,20 @@
         "prompt_invite": "Si ifra før det sendes invitasjoner til potensielt ugyldige Matrix-ID-er",
         "replace_plain_emoji": "Bytt automatisk ut råtekst-emojier",
         "security": {
-            "4s_public_key_in_account_data": "i kontodata",
-            "4s_public_key_status": "Offentlig nøkkel for hemmelig lagring:",
             "analytics_description": "Del anonyme data for å hjelpe oss med å identifisere problemer. Ikke noe personlig. Ingen tredjeparter.",
-            "backup_key_cached_status": "Sikkerhetskopieringsnøkkel bufret:",
-            "backup_key_stored_status": "Sikkerhetskopinøkkel lagret:",
-            "backup_key_unexpected_type": "uventet type",
-            "backup_key_well_formed": "godt utformet",
-            "backup_keys_description": "Ta sikkerhetskopi av krypteringsnøklene dine sammen med kontodataene dine i tilfelle du mister tilgangen til sesjonene dine. Nøklene dine vil være sikret med en unik sikkerhetsnøkkel.",
             "bulk_options_accept_all_invites": "Aksepter alle %(invitedRooms)s-invitasjoner",
             "bulk_options_reject_all_invites": "Avslå alle %(invitedRooms)s-invitasjoner",
             "bulk_options_section": "Bulk alternativer",
-            "cross_signing_cached": "cachet lokalt",
-            "cross_signing_homeserver_support": "Hjemmeserver-funksjonsstøtte:",
-            "cross_signing_homeserver_support_exists": "finnes",
-            "cross_signing_in_4s": "på hemmelig lager",
-            "cross_signing_in_memory": "i minnet",
-            "cross_signing_master_private_Key": "Master privat nøkkel:",
-            "cross_signing_not_cached": "ikke funnet lokalt",
-            "cross_signing_not_found": "ikke funnet",
-            "cross_signing_not_in_4s": "ikke funnet lagret",
-            "cross_signing_not_stored": "ikke lagret",
-            "cross_signing_private_keys": "Private nøkler for kryssignering:",
-            "cross_signing_public_keys": "Offentlige nøkler for kryssignering:",
-            "cross_signing_self_signing_private_key": "Selvsignert privat nøkkel:",
-            "cross_signing_user_signing_private_key": "Brukersignert privat nøkkel:",
-            "cryptography_section": "Kryptografi",
             "dehydrated_device_description": "Funksjonen for frakoblet enhet lar deg motta krypterte meldinger selv når du ikke er logget inn på noen enheter",
             "dehydrated_device_enabled": "Frakoblet enhet aktivert",
-            "delete_backup": "Slett sikkerhetskopien",
-            "delete_backup_confirm_description": "Er du sikker? Du vil miste tilgang til dine krypterte meldinger hvis nøklene dine ikke er sikkerhetskopiert på riktig måte.",
             "dialog_title": "<strong>Innstillinger: </strong> Sikkerhet og personvern",
             "e2ee_default_disabled_warning": "Serveradministratoren din har deaktivert ende-til-ende-kryptering som standard i private rom og direktemeldinger.",
             "enable_message_search": "Aktiver meldingssøk i krypterte rom",
             "encryption_section": "Kryptering",
-            "error_loading_key_backup_status": "Kan ikke laste inn backup status for hovednøkkel",
-            "export_megolm_keys": "Eksporter E2E-romnøkler",
             "ignore_users_empty": "Du har ingen ignorerte brukere.",
             "ignore_users_section": "Ignorerte brukere",
-            "import_megolm_keys": "Importer E2E-romnøkler",
-            "key_backup_active": "Denne sesjonen sikkerhetskopierer nøklene dine.",
-            "key_backup_active_version": "Aktiv sikkerhetskopiversion:",
-            "key_backup_active_version_none": "Ingen",
             "key_backup_algorithm": "Algoritme:",
-            "key_backup_can_be_restored": "Denne sikkerhetskopien kan gjenopprettes på denne sesjonen",
-            "key_backup_complete": "Alle nøkler er sikkerhetskopiert",
             "key_backup_connect": "Koble denne økten til hoved Backup",
-            "key_backup_connect_prompt": "Koble denne økten til sikkerhetskopiering av nøkler før du logger av for å unngå å miste nøkler som kanskje bare er på denne økten.",
-            "key_backup_in_progress": "Sikkerhetskopierer %(sessionsRemaining)s nøkler ...",
-            "key_backup_inactive": "Denne økten sikkerhetskopierer <b> ikke nøklene dine</b>, men du har en eksisterende sikkerhetskopi du kan gjenopprette fra og legge til i fremtiden.",
-            "key_backup_inactive_warning": "Dine nøkler <b>har ikke blitt sikkerhetskopiert fra denne økten</b>.",
-            "key_backup_latest_version": "Siste sikkerhetskopiversjon på server:",
             "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": {
@@ -2887,13 +2870,7 @@
             "message_search_unsupported": "%(brand)s mangler noen komponenter som kreves for sikker hurtigbufring av krypterte meldinger lokalt. Hvis du vil eksperimentere med denne funksjonen, kan du bygge et tilpasset %(brand)s skrivebord med <nativeLink> søkekomponenter lagt til</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s kan ikke sikkert bufre krypterte meldinger lokalt mens de kjører i en nettleser. Bruk <desktopLink>%(brand)s Skrivebord</desktopLink> for at krypterte meldinger skal vises i søkeresultatene.",
             "record_session_details": "Registrer klientnavn, versjon og url for å gjøre det enklere å gjenkjenne sesjoner i sesjonsadministratoren",
-            "restore_key_backup": "Gjenopprett fra sikkerhetskopi",
-            "secret_storage_not_ready": "ikke klar",
-            "secret_storage_ready": "klar",
-            "secret_storage_status": "Hemmelig lagring:",
             "send_analytics": "Send analytiske data",
-            "session_id": "Økt-ID:",
-            "session_key": "Øktnøkkel:",
             "strict_encryption": "Send bare meldinger til verifiserte brukere"
         },
         "send_read_receipts": "Send lesebekreftelser",
@@ -3136,8 +3113,6 @@
         "topic": "Henter eller setter rommets overskrift",
         "topic_none": "Dette rommet har ingen overskrift.",
         "topic_room_error": "Kunne ikke hente rommets emne: Kan ikke finne rom (%(roomId)s",
-        "tovirtual": "Bytter til dette rommets virtuelle rom, hvis det har et",
-        "tovirtual_not_found": "Ingen virtuelle rom for dette rommet",
         "unban": "Gir tilbake tilgang til bruker med gitt ID",
         "unflip": "Legger til ┬──┬ ノ( ゜-゜ノ) foran en ren tekstmelding",
         "unholdcall": "Tar samtalen i gjeldende rom ut av vent",
@@ -3260,7 +3235,7 @@
         "heading_without_query": "Søk etter",
         "join_button_text": "Bli med i %(roomAddress)s",
         "keyboard_scroll_hint": "Bruk <arrows/> for å scrolle",
-        "message_search_section_title": "Andre søk",
+        "messages_label": "Meldinger",
         "other_rooms_in_space": "Andre rom i %(spaceName)s",
         "public_rooms_label": "Offentlige rom",
         "public_spaces_label": "Offentlige områder",
@@ -3270,7 +3245,6 @@
         "result_may_be_hidden_privacy_warning": "Noen resultater kan være skjult av personvernhensyn",
         "result_may_be_hidden_warning": "Noen resultater kan være skjult",
         "search_dialog": "Søkedialog",
-        "search_messages_hint": "For å søke i meldinger, se etter dette ikonet øverst i et rom <icon/>",
         "spaces_title": "Områder du er i",
         "start_group_chat_button": "Start en gruppechat"
     },
@@ -3319,14 +3293,12 @@
     "threads_activity_centre": {
         "header": "Trådaktivitet",
         "no_rooms_with_threads_notifs": "Du har ikke rom med trådvarsler ennå.",
-        "no_rooms_with_unread_threads": "Du har ikke rom med uleste tråder ennå.",
-        "release_announcement_description": "Trådenotifikasjoner er flyttet, du finner dem her fra nå av.",
-        "release_announcement_header": "Aktivitetssenter for tråder"
+        "no_rooms_with_unread_threads": "Du har ikke rom med uleste tråder ennå."
     },
     "time": {
-        "about_day_ago": "for omtrent et døgn siden",
-        "about_hour_ago": "omtrent en time siden",
-        "about_minute_ago": "for omtrent et minutt siden",
+        "about_day_ago": "cirka 1 dag siden",
+        "about_hour_ago": "cirka 1 time siden",
+        "about_minute_ago": "cirka 1 minutt siden",
         "date_at_time": "%(date)s klokken %(time)s",
         "few_seconds_ago": "noen sekunder siden",
         "hours_minutes_seconds_left": "%(hours)st%(minutes)s m%(seconds)s s igjen",
@@ -3668,8 +3640,8 @@
                 "other": "%(severalUsers)sendret profilbildet deres %(count)s ganger"
             },
             "changed_name": {
-                "one": "%(oneUser)sendret navn",
-                "other": "%(oneUser)sendret navn %(count)s ganger"
+                "one": "%(oneUser)s endret navn",
+                "other": "%(oneUser)s endret navn %(count)s ganger"
             },
             "changed_name_multiple": {
                 "%(severalUsers)s endret navnene sine": "one"
@@ -3722,12 +3694,12 @@
                 "other": "ble fjernet %(count)s ganger"
             },
             "left": {
-                "one": "%(oneUser)sforlot",
-                "other": "%(oneUser)sforlot %(count)s ganger"
+                "one": "%(oneUser)s forlot",
+                "other": "%(oneUser)s forlot %(count)s ganger"
             },
             "left_multiple": {
-                "one": "%(severalUsers)forlot",
-                "other": "%(severalUsers)sforlot %(count)s ganger"
+                "one": "%(severalUsers)s forlot",
+                "other": "%(severalUsers)s forlot %(count)s ganger"
             },
             "no_change": {
                 "one": "%(oneUser)sgjorde ingen endringer",
@@ -3829,10 +3801,11 @@
         "unavailable": "Ikke tilgjengelig"
     },
     "update_room_access_modal": {
-        "description": "Hvis du vil opprette en delingslenke, må du tillate gjester å bli med i dette rommet. Dette kan gjøre rommet mindre sikkert. Når du er ferdig med samtalen, kan du gjøre rommet privat igjen.",
-        "dont_change_description": "Alternativt kan du holde samtalen i et eget rom.",
+        "description": "For å opprette en delingslenke, lag dette rommet <b>offentlig</b> eller aktiver alternativet for brukere å <b>be om å bli med</b> Dette lar gjester bli med uten å bli invitert.",
+        "dont_change_description": "Hvis du ikke ønsker å endre tilgangen til dette rommet, kan du opprette et nytt rom for lenken.",
         "no_change": "Jeg vil ikke endre tilgangsnivået.",
-        "title": "Endre tilgangsnivået til rommet"
+        "revert_access_description": "(Dette kan tilbakestilles til den forrige verdien i Rominnstillinger: <b>Sikkerhet og personvern</b> / <b>Tilgang</b>)",
+        "title": "Tillat gjestebrukere å bli med i dette rommet"
     },
     "upload_failed_generic": "Filen '%(fileName)s' kunne ikke lastes opp.",
     "upload_failed_size": "Filen \"%(fileName)s\" er større enn hjemmeserverens grense for opplastninger",
@@ -3848,8 +3821,8 @@
         "title_progress": "Last opp filer (%(current)s av %(total)s)",
         "upload_all_button": "Last opp alle",
         "upload_n_others_button": {
-            "one": "Last opp %(count)s en annen fil",
-            "other": "Last opp %(count)s andre filer"
+            "Last opp %(count)s andre filer": "Last opp %(count)s andre filer",
+            "Last opp %(count)s annen fil": "Last opp %(count)s en annen fil"
         }
     },
     "user_info": {
@@ -3889,8 +3862,8 @@
         "promote_warning": "Du vil ikke kunne angre denne endringen ettersom du promoterer brukeren til å ha samme tilgangsnivå som deg selv.",
         "redact": {
             "confirm_button": {
-                "one": "Fjern 1 melding",
-                "other": "Fjern %(count)s meldinger"
+                "Slett %(count)s meldinger": "Fjern 1 melding",
+                "Slett 1 melding": "Fjern %(count)s meldinger"
             },
             "confirm_description_1": {
                 "one": "Du er i ferd med å fjerne %(count)s melding fra %(user)s. Dette vil fjerne dem permanent for alle i samtalen. Ønsker du å fortsette?",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 2650a3831b..c8cfd1e8ba 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -94,7 +94,6 @@
         "react": "Reageren",
         "refresh": "Herladen",
         "register": "Registreren",
-        "reject": "Weigeren",
         "reload": "Herladen",
         "remove": "Verwijderen",
         "rename": "Hernoemen",
@@ -391,7 +390,6 @@
         "capabilities": "Mogelijkheden",
         "copied": "Gekopieerd!",
         "credits": "Met dank aan",
-        "cross_signing": "Kruiselings ondertekenen",
         "dark": "Donker",
         "description": "Omschrijving",
         "deselect_all": "Allemaal deselecteren",
@@ -694,44 +692,23 @@
     "empty_room_was_name": "Lege ruimte (was %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Voer uw veiligheidswachtwoord in of <button>gebruik uw veiligheidssleutel</button> om door te gaan.",
             "key_validation_text": {
-                "invalid_security_key": "Ongeldige veiligheidssleutel",
-                "recovery_key_is_correct": "Ziet er goed uit!",
-                "wrong_file_type": "Verkeerd bestandstype",
                 "wrong_security_key": "Verkeerde veiligheidssleutel"
             },
-            "reset_title": "Alles opnieuw instellen",
-            "reset_warning_1": "Doe dit alleen als u geen ander apparaat hebt om de verificatie mee uit te voeren.",
-            "reset_warning_2": "Als u alles reset zult u opnieuw opstarten zonder vertrouwde sessies, zonder vertrouwde personen, en zult u misschien geen oude berichten meer kunnen zien.",
             "restoring": "Sleutels herstellen vanaf back-up",
-            "security_key_title": "Veiligheidssleutel",
-            "security_phrase_incorrect_error": "Geen toegang tot geheime opslag. Controleer of u het juiste veiligheidswachtwoord hebt ingevoerd.",
-            "security_phrase_title": "Veiligheidswachtwoord",
-            "separator": "%(securityKey)s of %(recoveryFile)s",
-            "use_security_key_prompt": "Gebruik uw veiligheidssleutel om verder te gaan."
+            "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_not_ready": "Kruiselings ondertekenen is niet ingesteld.",
-        "cross_signing_ready": "Kruiselings ondertekenen is klaar voor gebruik.",
-        "cross_signing_ready_no_backup": "Kruiselings ondertekenen is klaar, maar de sleutels zijn nog niet geback-upt.",
         "cross_signing_room_normal": "Deze kamer is eind-tot-eind-versleuteld",
         "cross_signing_room_verified": "Iedereen in deze kamer is geverifieerd",
         "cross_signing_room_warning": "Iemand gebruikt een onbekende sessie",
-        "cross_signing_unsupported": "Jouw homeserver biedt geen ondersteuning voor kruiselings ondertekenen.",
-        "cross_signing_untrusted": "Jouw account heeft een identiteit voor kruiselings ondertekenen in de sleutelopslag, maar die wordt nog niet vertrouwd door de huidige sessie.",
         "cross_signing_user_normal": "Je hebt deze persoon niet geverifieerd.",
         "cross_signing_user_verified": "Je hebt deze persoon geverifieerd. Deze persoon heeft al zijn sessies geverifieerd.",
         "cross_signing_user_warning": "Deze persoon heeft niet al zijn sessies geverifieerd.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Sleutels voor kruiselings ondertekenen wissen",
-            "title": "Sleutels voor kruiselings ondertekenen verwijderen?",
-            "warning": "Het verwijderen van sleutels voor kruiselings ondertekenen is niet terug te draaien. Iedereen waarmee u geverifieerd heeft zal beveiligingswaarschuwingen te zien krijgen. U wilt dit hoogstwaarschijnlijk niet doen, tenzij u alle apparaten heeft verloren waarmee u kruiselings kon ondertekenen."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "De echtheid van dit versleutelde bericht kan op dit apparaat niet worden gegarandeerd.",
         "event_shield_reason_mismatched_sender_key": "Versleuteld door een niet-geverifieerde sessie",
         "export_unsupported": "Jouw browser ondersteunt de benodigde cryptografie-extensies niet",
@@ -751,7 +728,6 @@
             "title": "Nieuwe herstelmethode",
             "warning": "Als je deze nieuwe herstelmethode niet hebt ingesteld, is het mogelijk dat een aanvaller toegang tot jouw account probeert te krijgen. Wijzig onmiddellijk je wachtwoord en stel bij instellingen een nieuwe herstelmethode in."
         },
-        "not_supported": "<niet ondersteund>",
         "recovery_method_removed": {
             "description_1": "Deze sessie heeft ontdekt dat je veiligheidswachtwoord en -sleutel voor versleutelde berichten zijn verwijderd.",
             "description_2": "Als je dit per ongeluk hebt gedaan, kan je beveiligde berichten op deze sessie instellen, waarmee de berichtgeschiedenis van deze sessie opnieuw zal versleuteld worden aan de hand van een nieuwe herstelmethode.",
@@ -762,8 +738,7 @@
         "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.",
-            "title": "Instellen"
+            "explainer": "Maak een back-up van je sleutels voordat je jezelf afmeldt om ze niet te verliezen."
         },
         "udd": {
             "interactive_verification_button": "Interactief verifiëren door emoji",
@@ -778,7 +753,6 @@
             "accepting": "Toestaan…",
             "after_new_login": {
                 "device_verified": "Apparaat geverifieerd",
-                "reset_confirmation": "Echt je verificatiesleutels resetten?",
                 "skip_verification": "Verificatie voorlopig overslaan",
                 "unable_to_verify": "Kan dit apparaat niet verifiëren",
                 "verify_this_device": "Verifieer dit apparaat"
@@ -840,7 +814,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_reset_warning_1": "Het resetten van je verificatiesleutels kan niet ongedaan worden gemaakt. Na het resetten heb je geen toegang meer tot oude versleutelde berichten, en vrienden die je eerder hebben geverifieerd zullen veiligheidswaarschuwingen zien totdat je opnieuw bij hen geverifieert bent.",
             "verify_using_device": "Verifieer met andere apparaat",
             "verify_using_key": "Verifieer met veiligheidssleutel",
             "verify_using_key_or_phrase": "Verifieer met veiligheidssleutel of -wachtwoord",
@@ -895,11 +868,7 @@
             "title": "Kopiëren van kamerlink is mislukt"
         },
         "error_loading_user_profile": "Kon persoonsprofiel niet laden",
-        "forget_room_failed": "Vergeten van kamer is mislukt %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "De server is misschien onbereikbaar of overbelast, of het zoeken duurde te lang :(",
-            "title": "Zoeken mislukt"
-        }
+        "forget_room_failed": "Vergeten van kamer is mislukt %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1415,11 +1384,6 @@
         "ongoing": "Bezig met verwijderen…",
         "reason_label": "Reden (niet vereist)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Weet je zeker dat je de uitnodiging wilt weigeren?",
-        "failed": "Weigeren van uitnodiging is mislukt",
-        "title": "Uitnodiging weigeren"
-    },
     "report_content": {
         "description": "Dit bericht melden zal zijn unieke ‘gebeurtenis-ID’ versturen naar de beheerder van jouw homeserver. Als de berichten in deze kamer versleuteld zijn, zal de beheerder van jouw homeserver het bericht niet kunnen lezen, noch enige bestanden of afbeeldingen zien.",
         "disagree": "Niet mee eens",
@@ -1551,7 +1515,6 @@
             "you_created": "Jij hebt deze kamer gemaakt."
         },
         "invite_email_mismatch_suggestion": "Deel in de instellingen dit e-mailadres om uitnodigingen direct in %(brand)s te ontvangen.",
-        "invite_reject_ignore": "Weigeren en persoon negeren",
         "invite_sent_to_email": "De uitnodiging is verzonden naar %(email)s",
         "invite_sent_to_email_room": "Deze uitnodiging tot %(roomName)s was verstuurd naar %(email)s",
         "invite_subtitle": "<userName/> heeft je uitgenodigd",
@@ -2012,7 +1975,6 @@
             "remove_msisdn_prompt": "%(phone)s verwijderen?",
             "spell_check_locale_placeholder": "Kies een landinstelling"
         },
-        "image_thumbnails": "Miniaturen voor afbeeldingen tonen",
         "inline_url_previews_default": "Inline URL-voorvertoning standaard inschakelen",
         "inline_url_previews_room": "URL-voorvertoning voor alle deelnemers aan deze kamer standaard inschakelen",
         "inline_url_previews_room_account": "URL-voorvertoning in dit kamer inschakelen (geldt alleen voor jou)",
@@ -2113,48 +2075,16 @@
         "prompt_invite": "Uitnodigingen naar mogelijk ongeldige Matrix-ID’s bevestigen",
         "replace_plain_emoji": "Tekst automatisch vervangen door emoji",
         "security": {
-            "4s_public_key_in_account_data": "in accountinformatie",
-            "4s_public_key_status": "Sleutelopslag publieke sleutel:",
-            "backup_key_cached_status": "Back-up sleutel cached:",
-            "backup_key_stored_status": "Back-up sleutel bewaard:",
-            "backup_key_unexpected_type": "Onverwacht type",
-            "backup_key_well_formed": "goed gevormd",
-            "backup_keys_description": "Maak een back-up van je versleutelingssleutels met je accountgegevens voor het geval je de toegang tot je sessies verliest. Je sleutels worden beveiligd met een unieke veiligheidssleutel.",
             "bulk_options_accept_all_invites": "Alle %(invitedRooms)s de uitnodigingen aannemen",
             "bulk_options_reject_all_invites": "Alle %(invitedRooms)s de uitnodigingen weigeren",
             "bulk_options_section": "Bulkopties",
-            "cross_signing_cached": "lokaal opgeslagen",
-            "cross_signing_homeserver_support": "Homeserver functie ondersteuning:",
-            "cross_signing_homeserver_support_exists": "aanwezig",
-            "cross_signing_in_4s": "in de sleutelopslag",
-            "cross_signing_in_memory": "in het geheugen",
-            "cross_signing_master_private_Key": "Hoofdprivésleutel:",
-            "cross_signing_not_cached": "lokaal niet gevonden",
-            "cross_signing_not_found": "niet gevonden",
-            "cross_signing_not_in_4s": "Niet gevonden in de opslag",
-            "cross_signing_not_stored": "niet opgeslagen",
-            "cross_signing_private_keys": "Privésleutels voor kruiselings ondertekenen:",
-            "cross_signing_public_keys": "Publieke sleutels voor kruiselings ondertekenen:",
-            "cross_signing_self_signing_private_key": "Zelfondertekening-privésleutel:",
-            "cross_signing_user_signing_private_key": "Persoonsondertekening-privésleutel:",
-            "cryptography_section": "Cryptografie",
-            "delete_backup": "Back-up verwijderen",
-            "delete_backup_confirm_description": "Weet je het zeker? Je zal je versleutelde berichten verliezen als je sleutels niet correct geback-upt zijn.",
             "e2ee_default_disabled_warning": "De beheerder van je server heeft eind-tot-eind-versleuteling standaard uitgeschakeld in alle privékamers en directe gesprekken.",
             "enable_message_search": "Zoeken in versleutelde kamers inschakelen",
             "encryption_section": "Versleuteling",
-            "error_loading_key_backup_status": "Kan sleutelback-upstatus niet laden",
-            "export_megolm_keys": "E2E-kamersleutels exporteren",
             "ignore_users_empty": "Je hebt geen persoon genegeerd.",
             "ignore_users_section": "Genegeerde personen",
-            "import_megolm_keys": "E2E-kamersleutels importeren",
-            "key_backup_active_version_none": "Geen",
             "key_backup_algorithm": "Algoritme:",
-            "key_backup_complete": "Alle sleutels zijn geback-upt",
             "key_backup_connect": "Verbind deze sessie met de sleutelback-up",
-            "key_backup_connect_prompt": "Verbind deze sessie met de sleutelback-up voordat je jezelf afmeldt. Dit voorkomt dat je sleutels verliest die alleen op deze sessie voorkomen.",
-            "key_backup_inactive": "Deze sessie <b>maakt geen back-ups van je sleutels</b>, maar je beschikt over een reeds bestaande back-up waaruit je kan herstellen en waaraan je nieuwe sleutels vanaf nu kunt toevoegen.",
-            "key_backup_inactive_warning": "Jouw sleutels worden <b>niet geback-upt van deze sessie</b>.",
             "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": {
@@ -2174,13 +2104,7 @@
             "message_search_unsupported": "In %(brand)s ontbreken enige modulen vereist voor het veilig lokaal bewaren van versleutelde berichten. Wil je deze functie uittesten, compileer dan een aangepaste versie van %(brand)s Desktop <nativeLink>die de zoekmodulen bevat</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s kan versleutelde berichten niet veilig lokaal opslaan in een webbrowser. Gebruik <desktopLink>%(brand)s Desktop</desktopLink> om versleutelde berichten in zoekresultaten te laten verschijnen.",
             "record_session_details": "Noteer de naam, versie en url van de applicatie om sessies gemakkelijker te herkennen in sessiebeheer",
-            "restore_key_backup": "Uit back-up herstellen",
-            "secret_storage_not_ready": "Niet gereed",
-            "secret_storage_ready": "Gereed",
-            "secret_storage_status": "Sleutelopslag:",
             "send_analytics": "Gebruiksgegevens delen",
-            "session_id": "Sessie-ID:",
-            "session_key": "Sessiesleutel:",
             "strict_encryption": "Vanaf deze sessie nooit versleutelde berichten naar ongeverifieerde sessies versturen"
         },
         "send_read_receipts": "Stuur leesbevestigingen",
@@ -2363,8 +2287,6 @@
         "topic": "Verkrijgt het onderwerp van de kamer of stelt het in",
         "topic_none": "Deze kamer heeft geen onderwerp.",
         "topic_room_error": "Kameronderwerp laden mislukt: Kan kamer niet vinden (%(roomId)s",
-        "tovirtual": "Schakelt over naar de virtuele kamer van deze kamer, als die er is",
-        "tovirtual_not_found": "Geen virtuele ruimte voor deze ruimte",
         "unban": "Ontbant de persoon met de gegeven ID",
         "unflip": "Plakt ┬──┬ ノ( ゜-゜ノ) vóór een bericht zonder opmaak",
         "unholdcall": "De huidige oproep in huidige kamer in de wacht zetten",
@@ -2482,7 +2404,6 @@
         "heading_without_query": "Zoeken naar",
         "join_button_text": "%(roomAddress)s toetreden",
         "keyboard_scroll_hint": "Gebruik <arrows/> om te scrollen",
-        "message_search_section_title": "Andere zoekopdrachten",
         "other_rooms_in_space": "Andere kamers in %(spaceName)s",
         "public_rooms_label": "Publieke kamers",
         "recent_searches_section_title": "Recente zoekopdrachten",
@@ -2491,7 +2412,6 @@
         "result_may_be_hidden_privacy_warning": "Sommige resultaten kunnen om privacyredenen verborgen zijn",
         "result_may_be_hidden_warning": "Sommige resultaten zijn mogelijk verborgen",
         "search_dialog": "Dialoogvenster Zoeken",
-        "search_messages_hint": "Om berichten te zoeken, zoek naar dit icoon bovenaan een kamer <icon/>",
         "spaces_title": "Spaces waar u in zit",
         "start_group_chat_button": "Start een groepsgesprek"
     },
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 826968fea6..a2f8cbff2b 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -57,6 +57,8 @@
         "create_a_room": "Utwórz pokój",
         "create_account": "Utwórz konto",
         "decline": "Odrzuć",
+        "decline_and_block": "Odrzuć i zablokuj",
+        "decline_invite": "Odrzuć zaproszenie",
         "delete": "Usuń",
         "deny": "Odmów",
         "disable": "Wyłącz",
@@ -109,7 +111,6 @@
         "react": "Dodaj reakcję",
         "refresh": "Odśwież",
         "register": "Rejestracja",
-        "reject": "Odrzuć",
         "reload": "Przeładuj",
         "remove": "Usuń",
         "rename": "Zmień nazwę",
@@ -135,7 +136,7 @@
         "sign_out": "Wyloguj",
         "skip": "Pomiń",
         "start": "Rozpocznij",
-        "start_chat": "Rozpocznij rozmowę",
+        "start_chat": "Rozpocznij czat",
         "start_new_chat": "Nowy czat",
         "stop": "Zatrzymaj",
         "submit": "Wyślij",
@@ -238,7 +239,7 @@
             "description": "Czy na pewno chcesz się wylogować?",
             "megolm_export": "Ręcznie eksportuj klucze",
             "setup_key_backup_title": "Utracisz dostęp do swoich wiadomości szyfrowanych",
-            "setup_secure_backup_description_1": "Zaszyfrowane wiadomości są zabezpieczone przy użyciu szyfrowania end-to-end. Tylko Ty oraz ich adresaci posiadają klucze do ich rozszyfrowania.",
+            "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"
@@ -294,7 +295,7 @@
             "scan_qr_code": "Zaloguj się kodem QR",
             "security_code": "Kod bezpieczeństwa",
             "security_code_prompt": "Jeśli zostaniesz poproszony, wprowadź poniższy kod na drugim urządzeniu.",
-            "select_qr_code": "Wybierz \"%(scanQRCode)s\"",
+            "select_qr_code": "Wybierz '%(scanQRCode)s'",
             "unsupported_explainer": "Twój dostawca konta nie obsługuje logowania nowego urządzenia za pomocą kodu QR.",
             "unsupported_heading": "Kod QR nie jest wspierany",
             "waiting_for_device": "Oczekiwanie na logowanie urządzenia"
@@ -387,6 +388,7 @@
             "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_title": "Przejdź do swojego konta, aby zresetować swoją tożsamość",
             "msisdn": "Wysłano wiadomość tekstową do %(msisdn)s",
             "msisdn_token_incorrect": "Niepoprawny token",
             "msisdn_token_prompt": "Wpisz kod, który jest tam zawarty:",
@@ -470,7 +472,7 @@
         "accessibility": "Ułatwienia dostępu",
         "advanced": "Zaawansowane",
         "all_chats": "Wszystkie czaty",
-        "analytics": "Analityka",
+        "analytics": "Dane analityczne",
         "and_n_others": {
             "one": "i jeden inny...",
             "few": "i %(count)s innych...",
@@ -489,7 +491,6 @@
         "capabilities": "Możliwości",
         "copied": "Skopiowano!",
         "credits": "Podziękowania",
-        "cross_signing": "Weryfikacja krzyżowa",
         "dark": "Ciemny",
         "description": "Opis",
         "deselect_all": "Odznacz wszystkie",
@@ -528,6 +529,7 @@
         "message_timestamp_invalid": "Nieprawidłowy znacznik czasu",
         "microphone": "Mikrofon",
         "model": "Model",
+        "moderation_and_safety": "Moderacja i bezpieczeństwo",
         "modern": "Współczesny",
         "mute": "Wycisz",
         "n_members": {
@@ -558,7 +560,7 @@
         "private_room": "Pokój prywatny",
         "private_space": "Przestrzeń prywatna",
         "profile": "Profil",
-        "public": "Publiczny",
+        "public": "Publiczna",
         "public_room": "Pokój publiczny",
         "public_space": "Przestrzeń publiczna",
         "qr_code": "Kod QR",
@@ -750,6 +752,13 @@
         "twemoji": "Czcionka <twemoji>Twemoji</twemoji> jest w użyciu na warunkach licencji <terms>CC-BY 4.0</terms>. <author>© Twitter, Inc i pozostali kontrybutorzy</author>.",
         "twemoji_colr": "Czcionka <colr>twemoji-colr</colr> jest w użyciu na warunkach licencji <terms>Apache 2.0</terms>. <author>© Mozilla Foundation</author>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Czy na pewno chcesz odrzucić zaproszenie dołączenia do \"%(roomName)s\"?",
+        "ignore_user_help": "Nie zobaczysz żadnych wiadomości ani zaproszeń od tego użytkownika.",
+        "reason_description": "Opisz powód zgłoszenia pokoju.",
+        "report_room_description": "Zgłoś pokój dostawcy swojego konta.",
+        "title": "Odrzuć zaproszenie"
+    },
     "desktop_default_device_name": "Komputer %(brand)s: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktywne widżety",
@@ -834,9 +843,9 @@
         "room_notifications_type": "Typ: ",
         "room_status": "Status pokoju",
         "room_unread_status_count": {
-            "one": "Status nieprzeczytanej w pokoju: <strong>%(status)s</strong>, liczba: <strong>%(count)s</strong>",
-            "few": "Status nieprzeczytanych w pokoju: <strong>%(status)s</strong>, liczba: <strong>%(count)s</strong>",
-            "many": "Status nieprzeczytanych w pokoju: <strong>%(status)s</strong>, liczba: <strong>%(count)s</strong>"
+            "one": "Status nieprzeczytanej pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>",
+            "few": "Status nieprzeczytanych pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>",
+            "many": "Status nieprzeczytanych pokoju: <strong>%(status)s</strong>, ilość: <strong>%(count)s</strong>"
         },
         "save_setting_values": "Zapisz ustawione wartości",
         "see_history": "Pokaż historię",
@@ -851,6 +860,9 @@
         "setting_colon": "Ustawienie:",
         "setting_definition": "Definicja ustawienia:",
         "setting_id": "ID ustawienia",
+        "settings": {
+            "elementCallUrl": "Adres URL Element Call"
+        },
         "settings_explorer": "Eksplorator ustawień",
         "show_hidden_events": "Pokaż ukryte wydarzenia na linii czasowej",
         "spaces": {
@@ -904,44 +916,23 @@
     "empty_room_was_name": "Pusty pokój (poprzednio %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Wprowadź swoją frazę bezpieczeństwa lub <button>użyj klucza przywracania</button>, aby kontynuować.",
             "key_validation_text": {
-                "invalid_security_key": "Błędny klucz przywracania",
-                "recovery_key_is_correct": "Wygląda dobrze!",
-                "wrong_file_type": "Błędny typ pliku",
                 "wrong_security_key": "Błędny klucz przywracania"
             },
-            "reset_title": "Resetuj wszystko",
-            "reset_warning_1": "Zrób to tylko wtedy, gdy nie masz innego urządzenia, za pomocą którego mógłbyś zakończyć weryfikację.",
-            "reset_warning_2": "Jeśli zresetujesz wszystko, stracisz wszystkie sesje zaufane, użytkowników zaufanych i możliwe, że nie będziesz w stanie przeglądać historii czatu.",
             "restoring": "Przywracanie kluczy z kopii zapasowej",
-            "security_key_title": "Klucz przywracania",
-            "security_phrase_incorrect_error": "Nie można uzyskać dostępu do sekretnego magazynu. Upewnij się, że wprowadzono poprawne Hasło bezpieczeństwa.",
-            "security_phrase_title": "Hasło bezpieczeństwa",
-            "separator": "%(securityKey)s lub %(recoveryFile)s",
-            "use_security_key_prompt": "Użyj klucza przywracania, aby kontynuować."
+            "security_key_title": "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_not_ready": "Weryfikacja krzyżowa nie jest ustawiona.",
-        "cross_signing_ready": "Weryfikacja krzyżowa jest gotowa do użycia.",
-        "cross_signing_ready_no_backup": "Weryfikacja krzyżowa jest gotowa, ale klucze nie mają kopii zapasowej.",
         "cross_signing_room_normal": "Ten pokój jest szyfrowany end-to-end",
         "cross_signing_room_verified": "Wszyscy w tym pokoju są zweryfikowani",
         "cross_signing_room_warning": "Ktoś używa nieznanej sesji",
-        "cross_signing_unsupported": "Twój serwer domowy nie obsługuje 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ę.",
         "cross_signing_user_normal": "Nie zweryfikowałeś tego użytkownika.",
         "cross_signing_user_verified": "Zweryfikowałeś tego użytkownika. Użytkownik zweryfikował wszystkie swoje sesje.",
         "cross_signing_user_warning": "Ten użytkownik nie zweryfikował wszystkich swoich sesji.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Wyczyść klucze weryfikacji krzyżowej",
-            "title": "Zniszczyć klucze weryfikacji krzyżowej?",
-            "warning": "Usunięcie kluczy weryfikacji krzyżowej jest nieodwracalne. Każdy, z kim dokonano weryfikacji, zobaczy alerty bezpieczeństwa. Prawie na pewno nie chcesz tego robić, chyba że straciłeś każde urządzenie, z którego możesz weryfikować."
-        },
         "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_key": "Zaszyfrowano przez sesję niezweryfikowaną",
@@ -968,7 +959,6 @@
             "title": "Nowy sposób odzyskiwania",
             "warning": "Jeżeli nie ustawiłeś nowej metody odzyskiwania, atakujący może uzyskać dostęp do Twojego konta. Zmień hasło konta i natychmiast ustaw nową metodę odzyskiwania w Ustawieniach."
         },
-        "not_supported": "<niewspierany>",
         "pinned_identity_changed": "Tożsamość %(displayName)s (<b>%(userId)s</b>) została zresetowana. <a>Dowiedz się więcej</a>",
         "pinned_identity_changed_no_displayname": "Tożsamość <b>%(userId)s</b> została zresetowana. <a>Dowiedz się więcej</a>",
         "recovery_method_removed": {
@@ -984,8 +974,7 @@
         "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ć.",
-            "title": "Konfiguruj"
+            "explainer": "Utwórz kopię zapasową kluczy przed wylogowaniem, aby ich nie utracić."
         },
         "udd": {
             "interactive_verification_button": "Zweryfikuj interaktywnie za pomocą emoji",
@@ -1000,7 +989,6 @@
             "accepting": "Akceptowanie…",
             "after_new_login": {
                 "device_verified": "Urządzenie zweryfikowane",
-                "reset_confirmation": "Czy na pewno zresetować klucze weryfikacyjne?",
                 "skip_verification": "Pomiń weryfikację na razie",
                 "unable_to_verify": "Nie można zweryfikować tego urządzenia",
                 "verify_this_device": "Zweryfikuj to urządzenie"
@@ -1071,8 +1059,6 @@
             "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_reset_warning_1": "Zresetowanie kluczy weryfikacyjnych nie może być cofnięte. Po zresetowaniu, nie będziesz mieć dostępu do starych wiadomości szyfrowanych, a wszyscy znajomi, którzy wcześniej Cię zweryfikowali, będą widzieć ostrzeżenia do czasu ponownej weryfikacji.",
-            "verify_reset_warning_2": "Kontynuuj tylko wtedy, gdy masz pewność, że utraciłeś wszystkie inne urządzenia i swój klucz przywracania.",
             "verify_using_device": "Zweryfikuj innym urządzeniem",
             "verify_using_key": "Zweryfikuj kluczem przywracania",
             "verify_using_key_or_phrase": "Zweryfikuj kluczem przywracania lub frazą",
@@ -1141,11 +1127,7 @@
             "title": "Nie można skopiować linku do pokoju"
         },
         "error_loading_user_profile": "Nie udało się załadować profilu",
-        "forget_room_failed": "Nie mogłem zapomnieć o pokoju %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
-            "title": "Wyszukiwanie nie powiodło się"
-        }
+        "forget_room_failed": "Nie mogłem zapomnieć o pokoju %(errCode)s"
     },
     "error_user_not_logged_in": "Użytkownik nie jest zalogowany",
     "event_preview": {
@@ -1246,10 +1228,10 @@
     },
     "failed_load_async_component": "Nie można załadować! Sprawdź połączenie sieciowe i spróbuj ponownie.",
     "feedback": {
-        "can_contact_label": "Możesz się ze mną skontaktować, jeśli masz jakiekolwiek pytania",
+        "can_contact_label": "Wyrażam zgodę na kontakt ze mną, jeśli są jakiekolwiek pytania",
         "comment_label": "Komentarz",
         "existing_issue_link": "Najpierw zobacz <existingIssuesLink>istniejące zgłoszenia na GitHubie</existingIssuesLink>. Nic nie znalazłeś? <newIssueLink>Utwórz nowe</newIssueLink>.",
-        "may_contact_label": "Możesz się ze mną skontaktować, jeśli chcesz mnie śledzić lub pomóc wypróbować nadchodzące pomysły",
+        "may_contact_label": "Wyrażam zgodę na kontakt ze mną, jeśli pojawią się nowe informacje lub trzeba wypróbować nowe pomysły",
         "platform_username": "Twoja platforma i nazwa użytkownika zostaną zapisane, aby pomóc nam ulepszyć nasze produkty.",
         "pro_type": "PRO TIP: Jeżeli zgłaszasz błąd, wyślij <debugLogsLink>dzienniki debugowania</debugLogsLink>, aby pomóc nam znaleźć problem.",
         "send_feedback_action": "Wyślij opinię użytkownika",
@@ -1327,11 +1309,11 @@
         "connecting": "Łączenie z menedżerem integracji…",
         "error_connecting": "Menedżer integracji jest offline, lub nie może połączyć się z Twoim homeserverem.",
         "error_connecting_heading": "Nie udało się połączyć z menedżerem integracji",
-        "explainer": "Zarządcy integracji otrzymują dane konfiguracji, mogą modyfikować widżety, wysyłać zaproszenia do pokojów i ustawiać poziom uprawnień w Twoim imieniu.",
+        "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",
-        "use_im": "Użyj zarządcy integracji aby zarządzać botami, widżetami i pakietami naklejek.",
-        "use_im_default": "Użyj zarządcy Integracji <b>%(serverName)s</b> aby zarządzać botami, widżetami i pakietami naklejek."
+        "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."
     },
     "integrations": {
         "disabled_dialog_description": "Włącz '%(manageIntegrations)s' w ustawieniach, aby to zrobić.",
@@ -1401,8 +1383,9 @@
         "many": "Zapraszanie %(user)s i %(count)s innych"
     },
     "items_and_n_others": {
-        "other": "<Items/> i %(count)s innych",
-        "one": "<Items/> i jedna inna osoba"
+        "one": "<Items/> i jeszcze jedna osoba",
+        "few": "<Items/> i %(count)s inne",
+        "many": "<Items/> i %(count)s innych"
     },
     "keyboard": {
         "activate_button": "Aktywuj wybrany przycisk",
@@ -1551,7 +1534,7 @@
         "video_rooms": "Pokoje wideo",
         "video_rooms_a_new_way_to_chat": "Nowy sposób prowadzenia rozmów audio-wideo w %(brand)s.",
         "video_rooms_always_on_voip_channels": "Pokoje wideo są stale dostępnymi kanałami VoIP osadzonymi w pokoju w %(brand)s.",
-        "video_rooms_beta": "Rozmowy wideo to funkcja beta",
+        "video_rooms_beta": "Pokoje wideo są funkcją Beta",
         "video_rooms_faq1_answer": "Użyj przycisku \"+\" w sekcji pokoju lewego panelu.",
         "video_rooms_faq1_question": "Jak mogę stworzyć kanał wideo?",
         "video_rooms_faq2_answer": "Tak, oś czasu czatu jest wyświetlana wraz z wideo.",
@@ -1687,6 +1670,7 @@
         "class_global": "Globalne",
         "class_other": "Inne",
         "default": "Domyślne",
+        "default_settings": "Ustawienia domyślne",
         "email_pusher_app_display_name": "Powiadomienia e-mail",
         "enable_prompt_toast_description": "Włącz powiadomienia na pulpicie",
         "enable_prompt_toast_title": "Powiadomienia",
@@ -1705,7 +1689,8 @@
         "mentions_and_keywords_description": "Otrzymuj powiadomienia tylko z wzmiankami i słowami kluczowymi zgodnie z Twoimi <a>ustawieniami</a>",
         "mentions_keywords": "Wzmianki i słowa kluczowe",
         "message_didnt_send": "Nie wysłano wiadomości. Kliknij po więcej informacji.",
-        "mute_description": "Nie otrzymasz żadnych powiadomień"
+        "mute_description": "Nie otrzymasz żadnych powiadomień",
+        "mute_room": "Wycisz pokój"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s prosi o weryfikację"
@@ -1807,11 +1792,6 @@
         "ongoing": "Usuwanie…",
         "reason_label": "Powód (opcjonalne)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Czy na pewno chcesz odrzucić zaproszenie?",
-        "failed": "Nie udało się odrzucić zaproszenia",
-        "title": "Odrzuć zaproszenie"
-    },
     "report_content": {
         "description": "Zgłoszenie tej wiadomości wyśle administratorowi serwera unikatowe „ID wydarzenia”. Jeżeli wiadomości w tym pokoju są szyfrowane, administrator serwera może nie być w stanie przeczytać treści wiadomości, lub zobaczyć plików bądź zdjęć.",
         "disagree": "Nie zgadzam się",
@@ -1835,10 +1815,8 @@
         "toxic_behaviour": "Toksyczne zachowanie"
     },
     "report_room": {
-        "description": "Zgłoś ten pokój do administratora serwera domowego. Unikalne ID pokoju zostanie wysłane, lecz administrator nie będzie w mógł przeczytać żadnych wiadomości, ani plików szyfrowanych.",
-        "reason_placeholder": " Powód zgłoszenia...",
-        "sent": "Twój raport został wysłany.",
-        "title": "Zgłoś pokój"
+        "description": "Zgłoś ten pokój swojemu dostawcy konta. Jeśli wiadomości są zaszyfrowane, administrator nie będzie mógł ich odczytać.",
+        "reason_label": "Opisz powód"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Nie udało się odszyfrować %(failedCount)s sesji!",
@@ -2024,14 +2002,13 @@
             "you_created": "Utworzyłeś ten pokój."
         },
         "invite_email_mismatch_suggestion": "Udostępnij ten e-mail w Ustawieniach, aby otrzymywać zaproszenia bezpośrednio w %(brand)s.",
-        "invite_reject_ignore": "Odrzuć i zignoruj użytkownika",
         "invite_sent_to_email": "To zaproszenie zostało wysłane do %(email)s",
         "invite_sent_to_email_room": "To zaproszenie do %(roomName)s zostało wysłane do %(email)s",
         "invite_subtitle": "Zaproszony przez <userName/>",
         "invite_this_room": "Zaproś do tego pokoju",
         "invite_title": "Czy chcesz dołączyć do %(roomName)s?",
         "inviter_unknown": "Nieznany",
-        "invites_you_text": "<inviter/> zaprasza cię",
+        "invites_you_text": "<inviter/> wysłał Ci zaproszenie",
         "join_button_account": "Zarejestruj się",
         "join_failed_needs_invite": "Aby wyświetlić %(roomName)s, potrzebujesz zaproszenia",
         "join_the_discussion": "Dołącz do dyskusji",
@@ -2098,7 +2075,7 @@
             "monthly_user_limit_reached": "Wiadomość nie została wysłana, ponieważ serwer domowy przekroczył miesięczny limit aktywnych użytkowników. <a>Skontaktuj się z administratorem serwisu</a>, aby kontynuować.",
             "requires_consent_agreement": "Nie możesz wysłać żadnej wiadomości, dopóki nie zaakceptujesz <consentLink>naszych warunków i kondycji</consentLink>.",
             "retry_all": "Spróbuj ponownie wszystkie",
-            "select_messages_to_retry": "Możesz zaznaczyć wszystkie lub wybrane wiadomości aby spróbować ponownie lub usunąć je",
+            "select_messages_to_retry": "Możesz zaznaczyć wszystkie lub wybrane wiadomości, aby spróbować ponownie lub je usunąć",
             "server_connectivity_lost_description": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
             "server_connectivity_lost_title": "Połączenie z serwerem zostało utracone.",
             "some_messages_not_sent": "Niektóre z Twoich wiadomości nie zostały wysłane"
@@ -2121,6 +2098,7 @@
             },
             "uploading_single_file": "Przesyłanie %(filename)s"
         },
+        "video_room": "Ten pokój jest pokojem wideo",
         "waiting_for_join_subtitle": "Jak tylko zaproszeni użytkownicy dołączą do %(brand)s, będziesz mógł czatować w pokoju szyfrowanym end-to-end",
         "waiting_for_join_title": "Czekanie na użytkowników %(brand)s"
     },
@@ -2177,6 +2155,7 @@
             "more_options": "Więcej opcji",
             "open_room": "Pokój otwarty %(roomName)s"
         },
+        "room_options": "Opcje pokoju",
         "show_less": "Pokaż mniej",
         "show_n_more": {
             "one": "Pokaż %(count)s więcej",
@@ -2184,9 +2163,14 @@
             "many": "Pokaż %(count)s więcej"
         },
         "show_previews": "Pokazuj podgląd wiadomości",
+        "sort": "Sortuj",
         "sort_by": "Sortuj według",
         "sort_by_activity": "Aktywności",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Aktywność",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Pokazuj najpierw pokoje z nieprzeczytanymi wiadomościami",
         "space_menu": {
             "home": "Główna przestrzeni",
@@ -2222,7 +2206,7 @@
             "upgrade_dialog_description_3": "Zakaż rozmawiania w starej wersji pokoju i opublikuj wiadomość, aby użytkownicy przenieśli się do nowego",
             "upgrade_dialog_description_4": "Opublikuj link do starego pokoju na początku nowego, aby można było czytać stare wiadomości",
             "upgrade_dialog_title": "Uaktualnij wersję pokoju",
-            "upgrade_dwarning_ialog_title_public": "Aktualizuj pokój publiczny",
+            "upgrade_dwarning_ialog_title_public": "Ulepsz pokój publiczny",
             "upgrade_warning_dialog_description": "Aktualizowanie pokoju to zaawansowane działanie i zaleca się je głównie, kiedy pokój jest niestabilny, brakuje w nim funkcji lub znajdują się w nim luki bezpieczeństwa.",
             "upgrade_warning_dialog_explainer": "<b>Aktualizacja spowoduje utworzenie pokoju w nowej wersji</b>. Wszystkie bieżące wiadomości zostaną zarchiwizowane w tym pokoju.",
             "upgrade_warning_dialog_footer": "Zaktualizujesz ten pokój z wersji <oldVersion /> do <newVersion />.",
@@ -2474,6 +2458,10 @@
         "recent_changes_heading": "Najnowsze zmiany nie zostały jeszcze wprowadzone",
         "title": "Serwer nie odpowiada"
     },
+    "service_worker_error": {
+        "description": "%(brand)s wymaga workera usługi, aby móc załadować zabezpieczone media z repozytoriów Matrix. Ta funkcja nie jest obsługiwana przez Twoją przeglądarkę, więc niektóre media mogą się nie załadować.",
+        "title": "Nie udało się załadować workera usługi"
+    },
     "seshat": {
         "error_initialising": "Wystąpił błąd inicjalizacji wyszukiwania wiadomości, sprawdź <a>swoje ustawienia</a> po więcej informacji",
         "reset_button": "Resetuj bank wydarzeń",
@@ -2543,7 +2531,7 @@
         },
         "emoji_autocomplete": "Włącz podpowiedzi Emoji podczas pisania",
         "enable_markdown": "Włącz Markdown",
-        "enable_markdown_description": "Rozpocznij wiadomość z <code>/plain</code>, aby była bez markdownu.",
+        "enable_markdown_description": "Rozpocznij wiadomość z <code>/plain</code>, aby nie zawierała markdownu.",
         "encryption": {
             "advanced": {
                 "breadcrumb_first_description": "Dane konta, kontakty, preferencje i lista czatów zostaną zachowane",
@@ -2552,6 +2540,7 @@
                 "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_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.",
                 "details_title": "Szczegóły szyfrowania",
                 "do_not_close_warning": "Nie zamykaj tego okna, dopóki reset nie zostanie zakończony",
@@ -2580,7 +2569,7 @@
             "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 Ci to przeglądanie historii wiadomości na wszystkich nowych urządzeniach.<a>Dowiedz się więcej</a>",
+                "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>",
                 "title": "Magazyn kluczy"
             },
             "recovery": {
@@ -2589,7 +2578,7 @@
                 "change_recovery_confirm_title": "Wprowadź nowy klucz przywracania",
                 "change_recovery_key": "Zmień klucz przywracania",
                 "change_recovery_key_description": "Zapisz nowy klucz przywracania w bezpiecznym miejscu. Następnie kliknij Kontynuuj, aby zastosować zmiany.",
-                "change_recovery_key_title": "Zmień klucz przywracania?",
+                "change_recovery_key_title": "Zmienić klucz przywracania?",
                 "description": "Odzyskaj swoją tożsamość kryptograficzną i historię wiadomości za pomocą klucza przywracania, jeśli stracisz dostęp do swoich urządzeń.",
                 "enter_key_error": "Wprowadzony klucz przywracania nie jest poprawny.",
                 "enter_recovery_key": "Wprowadź klucz przywracania",
@@ -2647,10 +2636,11 @@
             "discovery_email_empty": "Opcje odkrywania pojawią się, gdy dodasz adres e-mail.",
             "discovery_email_verification_instructions": "Zweryfikuj link w swojej skrzynce odbiorczej",
             "discovery_msisdn_empty": "Opcje odkrywania pojawią się, gdy dodasz numer telefonu.",
-            "discovery_needs_terms": "Musisz wyrazić zgodę na warunki świadczenia usług serwera (%(serverName)s), aby umożliwić odkrywanie Cię za pomocą adresu e-mail oraz numeru telefonu.",
+            "discovery_needs_terms": "Musisz wyrazić zgodę na warunki świadczenia usług serwera (%(serverName)s), aby można było Cię odkryć za pomocą adresu e-mail oraz numeru telefonu.",
             "discovery_needs_terms_title": "Pozwól ludziom Cię znaleźć",
             "display_name": "Wyświetlana nazwa",
             "display_name_error": "Nie można ustawić wyświetlanej nazwy",
+            "email_adding_unsupported_by_hs": "Ten serwer domowy nie obsługuje dodawania adresów e-mail do Twojego konta.",
             "email_address_in_use": "Podany adres e-mail jest już w użyciu",
             "email_address_label": "Adres e-mail",
             "email_not_verified": "Twój adres e-mail nie został jeszcze zweryfikowany",
@@ -2675,7 +2665,9 @@
             "error_share_msisdn_discovery": "Nie udało się udostępnić numeru telefonu",
             "identity_server_no_token": "Nie znaleziono tokena dostępu tożsamości",
             "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_in_use": "Ten numer telefonu jest już zajęty",
             "msisdn_label": "Numer telefonu",
             "msisdn_verification_field_label": "Kod weryfikacyjny",
@@ -2694,12 +2686,10 @@
             "unable_to_load_msisdns": "Nie można załadować numerów telefonu",
             "username": "Nazwa użytkownika"
         },
-        "image_thumbnails": "Pokaż podgląd/miniatury obrazów",
         "inline_url_previews_default": "Włącz domyślny podgląd URL w tekście",
         "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_avatars": "Pokaż awatary pokoi, do których zostałeś zaproszony",
         "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).",
@@ -2714,7 +2704,7 @@
                 "confirm_security_phrase": "Potwierdź swoje hasło bezpieczeństwa",
                 "description": "Zabezpiecz się przed utratą dostępu do szyfrowanych wiadomości i danych, tworząc kopię zapasową kluczy szyfrowania na naszym serwerze.",
                 "download_or_copy": "%(downloadButton)s lub %(copyButton)s",
-                "enter_phrase_description": "Wprowadź hasło bezpieczeństwa, które znasz tylko Ty, ponieważ będzie użyte do ochrony Twoich danych. Ze względów bezpieczeństwa, nie wprowadzaj hasła Twojego konta.",
+                "enter_phrase_description": "Wprowadź frazę bezpieczeństwa, którą znasz tylko Ty, ponieważ wykorzystamy ją ochrony Twoich danych. Ze względów bezpieczeństwa, nie wprowadzaj tutaj swojego hasła.",
                 "enter_phrase_title": "Wprowadź hasło bezpieczeństwa",
                 "enter_phrase_to_confirm": "Wprowadź hasło bezpieczeństwa ponownie, aby potwierdzić.",
                 "generate_security_key_description": "Wygenerujemy dla Ciebie klucz przywracania, który możesz przechowywać w bezpiecznym miejscu, np. w menedżerze haseł lub sejfie.",
@@ -2758,6 +2748,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Ustawienia:</strong> Ignorowani użytkownicy"
         },
+        "media_preview": {
+            "hide_avatars": "Ukryj awatary pokoju i zapraszającego",
+            "hide_media": "Zawsze ukrywaj",
+            "media_preview_description": "Ukryte media można zawsze wyświetlić, dotykając ich",
+            "media_preview_label": "Pokaż media na osi czasu",
+            "show_in_private": "W pokojach prywatnych",
+            "show_media": "Zawsze pokazuj"
+        },
         "notifications": {
             "default_setting_description": "To ustawienie zastosuje się do wszystkich Twoich pokoi.",
             "default_setting_section": "Chce otrzymywać powiadomienia (Domyślne ustawienie)",
@@ -2786,7 +2784,7 @@
             "mentions_keywords": "Wzmianki i słowa kluczowe",
             "mentions_keywords_only": "Wyłącznie wzmianki i słowa kluczowe",
             "messages_containing_keywords": "Wiadomości zawierające słowa kluczowe",
-            "noisy": "Głośny",
+            "noisy": "Głośno",
             "notices": "Wiadomości wysłane przez boty",
             "notify_at_room": "Powiadom mnie, gdy ktoś użyje wzmianki @room",
             "notify_keyword": "Powiadom, gdy ktoś używa słowa kluczowego",
@@ -2803,11 +2801,11 @@
             "rule_call": "Zaproszenie do rozmowy",
             "rule_contains_display_name": "Wiadomości zawierające moją wyświetlaną nazwę",
             "rule_contains_user_name": "Wiadomości zawierające moją nazwę użytkownika",
-            "rule_encrypted": "Zaszyfrowane wiadomości w rozmowach grupowych",
-            "rule_encrypted_room_one_to_one": "Zaszyfrowane wiadomości w rozmowach jeden-do-jednego",
+            "rule_encrypted": "Wiadomości szyfrowane w czatach grupowych",
+            "rule_encrypted_room_one_to_one": "Wiadomości szyfrowane w czatach jeden-na-jeden",
             "rule_invite_for_me": "Kiedy zostanę zaproszony do pokoju",
             "rule_message": "Wiadomości w czatach grupowych",
-            "rule_room_one_to_one": "Wiadomości w rozmowach jeden-na-jeden",
+            "rule_room_one_to_one": "Wiadomości w czatach jeden-na-jeden",
             "rule_roomnotif": "Wiadomości zawierające @room",
             "rule_suppress_notices": "Wiadomości wysłane przez bota",
             "rule_tombstone": "Kiedy pokoje są uaktualniane",
@@ -2843,57 +2841,20 @@
         "prompt_invite": "Powiadamiaj przed wysłaniem zaproszenia do potencjalnie nieprawidłowych ID matrix",
         "replace_plain_emoji": "Automatycznie zastępuj tekstowe emotikony",
         "security": {
-            "4s_public_key_in_account_data": "w danych konta",
-            "4s_public_key_status": "Klucz publiczny sekretnego magazynu:",
             "analytics_description": "Udostępnij anonimowe dane, aby pomóc nam zidentyfikować problemy. Nic osobistego. Żadnych stron trzecich.",
-            "backup_key_cached_status": "Klucz zapasowy zapisany w pamięci podręcznej:",
-            "backup_key_stored_status": "Klucz zapasowy zapisany:",
-            "backup_key_unexpected_type": "niespodziewany typ",
-            "backup_key_well_formed": "dobrze ukształtowany",
-            "backup_keys_description": "Utwórz kopię zapasową kluczy szyfrujących wraz z danymi konta na wypadek utraty dostępu do sesji. Klucze będą zabezpieczone unikalnym kluczem przywracania.",
             "bulk_options_accept_all_invites": "Zaakceptuj wszystkie zaproszenia do %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Odrzuć wszystkie zaproszenia do %(invitedRooms)s",
             "bulk_options_section": "Masowe działania",
-            "cross_signing_cached": "w lokalnej pamięci podręcznej",
-            "cross_signing_homeserver_support": "Wsparcie funkcji serwera domowego:",
-            "cross_signing_homeserver_support_exists": "istnieje",
-            "cross_signing_in_4s": "w sekretnym magazynie",
-            "cross_signing_in_memory": "w pamięci",
-            "cross_signing_master_private_Key": "Główny klucz prywatny:",
-            "cross_signing_not_cached": "nie odnaleziono lokalnie",
-            "cross_signing_not_found": "nie znaleziono",
-            "cross_signing_not_in_4s": "nie odnaleziono w pamięci",
-            "cross_signing_not_stored": "nieprzechowywany",
-            "cross_signing_private_keys": "Klucze prywatne weryfikacji krzyżowej:",
-            "cross_signing_public_keys": "Klucze publiczne weryfikacji krzyżowej:",
-            "cross_signing_self_signing_private_key": "Samo-podpisujący klucz prywatny:",
-            "cross_signing_user_signing_private_key": "Podpisany przez użytkownika klucz prywatny:",
-            "cryptography_section": "Kryptografia",
             "dehydrated_device_description": "Funkcja urządzenia offline umożliwia odbieranie wiadomości szyfrowanych, nawet jeśli nie jesteś zalogowany na żadnym urządzeniu",
             "dehydrated_device_enabled": "Urządzenie offline włączone",
-            "delete_backup": "Usuń kopię zapasową",
-            "delete_backup_confirm_description": "Czy jesteś pewien? Stracisz dostęp do wszystkich swoich zaszyfrowanych wiadomości, jeżeli nie utworzyłeś poprawnej kopii zapasowej kluczy.",
             "dialog_title": "<strong>Ustawienia:</strong> Bezpieczeństwo i prywatność",
             "e2ee_default_disabled_warning": "Twój administrator serwera wyłączył domyślne szyfrowanie end-to-end w pokojach i wiadomościach prywatnych.",
             "enable_message_search": "Włącz wyszukiwanie wiadomości w szyfrowanych pokojach",
             "encryption_section": "Szyfrowanie",
-            "error_loading_key_backup_status": "Nie można załadować stanu kopii zapasowej klucza",
-            "export_megolm_keys": "Eksportuj klucze pokojów E2E",
             "ignore_users_empty": "Nie posiadasz ignorowanych użytkowników.",
             "ignore_users_section": "Ignorowani użytkownicy",
-            "import_megolm_keys": "Importuj klucze pokojów E2E",
-            "key_backup_active": "Ta sesja tworzy kopię zapasową kluczy.",
-            "key_backup_active_version": "Aktywna wersja kopii zapasowej:",
-            "key_backup_active_version_none": "Brak",
             "key_backup_algorithm": "Algorytm:",
-            "key_backup_can_be_restored": "Tę kopię zapasową można przywrócić w tej sesji",
-            "key_backup_complete": "Utworzono kopię zapasową wszystkich kluczy",
             "key_backup_connect": "Połącz tę sesję z kopią zapasową kluczy",
-            "key_backup_connect_prompt": "Połącz tę sesję z kopią zapasową kluczy przed wylogowaniem, aby uniknąć utraty kluczy które mogą istnieć tylko w tej sesji.",
-            "key_backup_in_progress": "Tworzenie kopii zapasowej %(sessionsRemaining)s kluczy…",
-            "key_backup_inactive": "Ta sesja <b>nie wykonuje kopii zapasowej twoich kluczy</b>, ale masz istniejącą kopię którą możesz przywrócić i uzupełniać w przyszłości.",
-            "key_backup_inactive_warning": "Twoje klucze <b>nie są zapisywanie na tej sesji</b>.",
-            "key_backup_latest_version": "Najnowsza wersja kopii zapasowej na serwerze:",
             "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": {
@@ -2905,21 +2866,15 @@
             "message_search_indexed_rooms": "Pokoje indeksowane:",
             "message_search_indexing": "Aktualnie indeksowanie: %(currentRoom)s",
             "message_search_indexing_idle": "Aktualnie nie są indeksowane wiadomości z żadnego pokoju.",
-            "message_search_intro": "%(brand)s bezpiecznie przechowuje wiadomości szyfrowane lokalnie, aby mogły pojawić się w wynikach wyszukiwania:",
+            "message_search_intro": "%(brand)s bezpiecznie i lokalnie przechowuje wiadomości szyfrowane, aby mogły pojawić się w wynikach wyszukiwania:",
             "message_search_room_progress": "%(doneRooms)s z %(totalRooms)s",
             "message_search_section": "Wyszukiwanie wiadomości",
             "message_search_sleep_time": "Jak szybko powinny być pobierane wiadomości.",
-            "message_search_space_used": "Użyte miejsce:",
+            "message_search_space_used": "Wykorzystane miejsce:",
             "message_search_unsupported": "%(brand)s brakuje niektórych komponentów wymaganych do bezpiecznego przechowywania wiadomości szyfrowanych lokalnie. Jeśli chcesz eksperymentować z tą funkcją, zbuduj własny %(brand)s Desktop z <nativeLink> dodanymi komponentami wyszukiwania</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s nie jest w stanie bezpiecznie przechowywać wiadomości szyfrowanych lokalnie, gdy działa w przeglądarce. Użyj <desktopLink> Desktop</desktopLink>, aby wiadomości pojawiły się w wynikach wyszukiwania.",
             "record_session_details": "Zapisz nazwę klienta, wersję i URL, aby łatwiej rozpoznawać sesje w menedżerze sesji",
-            "restore_key_backup": "Przywróć z kopii zapasowej",
-            "secret_storage_not_ready": "niegotowe",
-            "secret_storage_ready": "gotowy",
-            "secret_storage_status": "Sekretny magazyn:",
             "send_analytics": "Wysyłaj dane analityczne",
-            "session_id": "Identyfikator sesji:",
-            "session_key": "Klucz sesji:",
             "strict_encryption": "Wysyłaj wiadomości tylko do zweryfikowanych użytkowników"
         },
         "send_read_receipts": "Wysyłaj potwierdzenia przeczytania",
@@ -2992,7 +2947,7 @@
             "security_recommendations_description": "Zwiększ bezpieczeństwo swojego konta kierując się tymi rekomendacjami.",
             "session_id": "Identyfikator sesji",
             "show_details": "Pokaż szczegóły",
-            "sign_in_with_qr": "Połącz nowe urządzenie",
+            "sign_in_with_qr": "Powiąż nowe urządzenie",
             "sign_in_with_qr_button": "Pokaż kod QR",
             "sign_in_with_qr_description": "Użyj kodu QR, aby zalogować się na innym urządzeniu i skonfigurować bezpieczne przesyłanie wiadomości.",
             "sign_in_with_qr_unsupported": "Nieobsługiwane przez dostawcę konta",
@@ -3060,7 +3015,7 @@
         "use_control_enter_send_message": "Użyj Ctrl + Enter, aby wysłać wiadomość",
         "use_control_f_search": "Użyj Ctrl + F aby przeszukać oś czasu",
         "voip": {
-            "allow_p2p": "Zezwól Peer-to-Peer dla połączeń 1:1",
+            "allow_p2p": "Zezwól na Peer-to-Peer dla połączeń 1:1",
             "allow_p2p_description": "Po włączeniu, inni użytkownicy będą mogli zobaczyć twój adres IP",
             "audio_input_empty": "Nie wykryto żadnego mikrofonu",
             "audio_output": "Wyjście audio",
@@ -3162,8 +3117,6 @@
         "topic": "Wyświetla lub ustawia temat pokoju",
         "topic_none": "Ten pokój nie ma tematu.",
         "topic_room_error": "Nie można znaleźć tematu pokoju: Nie można znaleźć pokoju (%(roomId)s",
-        "tovirtual": "Przełącza do wirtualnego pokoju tego pokoju, jeśli taki istnieje",
-        "tovirtual_not_found": "Brak wirtualnego pokoju dla tego pokoju",
         "unban": "Odblokowuje użytkownika o danym ID",
         "unflip": "Dodaje ┬──┬ ノ( ゜-゜ノ) na początku wiadomości tekstowej",
         "unholdcall": "Odwiesza połączenie w obecnym pokoju",
@@ -3286,7 +3239,7 @@
         "heading_without_query": "Szukaj",
         "join_button_text": "Dołącz %(roomAddress)s",
         "keyboard_scroll_hint": "Użyj <arrows/>, aby przewijać",
-        "message_search_section_title": "Inne wyszukiwania",
+        "messages_label": "Wiadomości",
         "other_rooms_in_space": "Inne pokoje w %(spaceName)s",
         "public_rooms_label": "Pokoje publiczne",
         "public_spaces_label": "Przestrzenie publiczne",
@@ -3296,7 +3249,6 @@
         "result_may_be_hidden_privacy_warning": "Niektóre wyniki zostały ukryte dla ochrony prywatności",
         "result_may_be_hidden_warning": "Niektóre wyniki mogą być ukryte",
         "search_dialog": "Pasek wyszukiwania",
-        "search_messages_hint": "Aby szukać wiadomości, poszukaj tej ikony na górze pokoju <icon/>",
         "spaces_title": "Przestrzenie, w których jesteś",
         "start_group_chat_button": "Rozpocznij czat grupowy"
     },
@@ -3334,7 +3286,7 @@
             "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ążyć.",
+        "empty_title": "Wątki pomagają utrzymać tematykę rozmów i łatwo za nimi podążać.",
         "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",
@@ -3345,9 +3297,7 @@
     "threads_activity_centre": {
         "header": "Aktywność wątków",
         "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.",
-        "release_announcement_description": "Powiadomienia w wątkach zostały przeniesione, teraz znajdziesz je tutaj.",
-        "release_announcement_header": "Centrum aktywności wątków"
+        "no_rooms_with_unread_threads": "Nie masz jeszcze pokoi z nieprzeczytanymi wątkami."
     },
     "time": {
         "about_day_ago": "około dzień temu",
@@ -3726,16 +3676,19 @@
                 "other": "zostało zaproszonych %(count)s razy"
             },
             "joined": {
-                "other": "%(oneUser)s dołączył %(count)s razy",
-                "one": "%(oneUser)s dołączył"
+                "one": "%(oneUser)s dołączył",
+                "few": "%(oneUser)s dołączył %(count)s raz",
+                "many": "%(oneUser)s dołączył %(count)s razy"
             },
             "joined_and_left": {
-                "other": "%(oneUser)s dołączył i wyszedł %(count)s razy",
-                "one": "%(oneUser)s dołączył i wyszedł"
+                "one": "%(oneUser)s dołączył i wyszedł",
+                "few": "%(oneUser)s dołączył i wyszedł %(count)s razy",
+                "many": "%(oneUser)s dołączył i wyszedł %(count)s razy"
             },
             "joined_and_left_multiple": {
                 "one": "%(severalUsers)s dołączyło i wyszło",
-                "other": "%(severalUsers)s dołączyło i wyszło %(count)s razy"
+                "few": "%(severalUsers)s dołączyło i wyszło %(count)s razy",
+                "many": "%(severalUsers)s dołączyło i wyszło %(count)s razy"
             },
             "joined_multiple": {
                 "one": "%(severalUsers)s dołączył",
@@ -3791,12 +3744,14 @@
                 "other": "%(severalUsers)sodrzuciło ich zaproszenia %(count)s razy"
             },
             "rejoined": {
-                "other": "%(oneUser)s wyszedł i dołączył ponownie %(count)s razy",
-                "one": "%(oneUser)s wyszedł i dołączył ponownie"
+                "one": "%(oneUser)s wyszedł i dołączył ponownie",
+                "few": "%(oneUser)s wyszedł i dołączył ponownie %(count)s razy",
+                "many": "%(oneUser)s wyszedł i dołączył ponownie %(count)s razy"
             },
             "rejoined_multiple": {
-                "other": "%(severalUsers)swyszło i dołączyło ponownie %(count)s razy",
-                "one": "%(severalUsers)swyszło i dołączyło ponownie"
+                "one": "%(severalUsers)s wyszło i dołączyło ponownie",
+                "few": "%(severalUsers)s wyszło i dołączyło ponownie %(count)s razy",
+                "many": "%(severalUsers)s wyszło i dołączyło ponownie %(count)s razy"
             },
             "server_acls": {
                 "one": "%(oneUser)szmienił ACL serwera",
@@ -3860,10 +3815,11 @@
         "unavailable": "Niedostępny"
     },
     "update_room_access_modal": {
-        "description": "Aby utworzyć link udostępniania, musisz zezwolić gościom na dołączenie do tego pokoju. Może to zmniejszyć bezpieczeństwo pokoju. Gdy zakończysz połączenie, możesz ustawić pokój jako prywatny z powrotem.",
-        "dont_change_description": "Możesz również zadzwonić w innym pokoju.",
+        "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ń.",
-        "title": "Zmień poziom dostępu pokoju"
+        "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"
     },
     "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",
@@ -4019,7 +3975,8 @@
         "msisdn_transfer_failed": "Nie udało się przekazać połączenia",
         "n_people_joined": {
             "one": "%(count)s osoba dołączyła",
-            "other": "%(count)s osób dołączyło"
+            "few": "%(count)s osoby dołączyły",
+            "many": "%(count)s osób dołączyło"
         },
         "no_audio_input_description": "Nie udało się znaleźć żadnego mikrofonu w twoim urządzeniu. Sprawdź ustawienia i spróbuj ponownie.",
         "no_audio_input_title": "Nie znaleziono mikrofonu",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index a4e71bf9b7..db6df857a6 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -64,7 +64,8 @@
         "go": "Ir",
         "go_back": "Voltar",
         "got_it": "Entendi",
-        "hide_advanced": "Ocultar avançado",
+        "hide": "Ocultar",
+        "hide_advanced": "Ocultar avançadas",
         "hold": "Espera",
         "ignore": "Ignorar",
         "import": "Importar",
@@ -80,12 +81,14 @@
         "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",
         "no": "Não",
         "ok": "OK",
         "open": "Abrir",
+        "open_menu": "Abrir menu",
         "pause": "Pausar",
         "pin": "Fixar",
         "play": "Reproduzir",
@@ -94,7 +97,6 @@
         "react": "Reagir",
         "refresh": "Atualizar",
         "register": "Registar",
-        "reject": "Rejeitar",
         "reload": "Recarregar",
         "remove": "Remover",
         "rename": "Renomear",
@@ -405,6 +407,15 @@
         "download_logs": "Descarrega os registos",
         "downloading_logs": "Descarregando registos",
         "error_empty": "Diz-nos o que correu mal ou, melhor ainda, cria uma questão no GitHub que descreva o problema.",
+        "failed_download_logs": "Falha ao descarregar os registos de depuração: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "O teu relatório de erro foi rejeitado. O servidor rageshake não suporta esta aplicação.",
+            "rejected_generic": "O teu relatório de bug foi rejeitado. O servidor do rageshake rejeitou o conteúdo do relatório devido a uma política.",
+            "rejected_recovery_key": "O teu relatório de erro foi rejeitado por razões de segurança, pois continha uma chave de recuperação.",
+            "rejected_version": "O teu relatório de erro foi rejeitado porque a versão que estás a executar é demasiado antiga.",
+            "server_unknown_error": "O servidor do rageshake encontrou um erro desconhecido e não pôde processar o relatório.",
+            "unknown_error": "Não conseguiste enviar os registos."
+        },
         "github_issue": "Problema no GitHub",
         "introduction": "Se submeteste um erro através do GitHub, os registos de depuração podem ajudar-nos a localizar o problema. ",
         "log_request": "Para nos ajudar a evitar esta situação no futuro, envia-nos os registos para <a></a> .",
@@ -444,6 +455,7 @@
         "access_token": "Token de acesso",
         "accessibility": "Acessibilidade",
         "advanced": "Avançado",
+        "all_chats": "Todas as conversas",
         "analytics": "Análise",
         "and_n_others": {
             "other": "e %(count)s outros...",
@@ -462,7 +474,6 @@
         "capabilities": "Capacidades",
         "copied": "Copiado!",
         "credits": "Créditos",
-        "cross_signing": "Assinatura cruzada",
         "dark": "Escuro",
         "description": "Descrição",
         "deselect_all": "Desmarcar todos",
@@ -874,44 +885,23 @@
     "empty_room_was_name": "Sala vazia (era %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Introduz a tua frase de segurança ou <button>utiliza a tua chave de recuperação</button> para continuar.",
             "key_validation_text": {
-                "invalid_security_key": "Chave de recuperação inválida",
-                "recovery_key_is_correct": "Parece bom!",
-                "wrong_file_type": "Tipo de ficheiro errado",
                 "wrong_security_key": "Chave de recuperação errada"
             },
-            "reset_title": "Repor tudo",
-            "reset_warning_1": "Faz isto apenas se não tiveres outro dispositivo para completar a verificação.",
-            "reset_warning_2": "Se reiniciares tudo, irás reiniciar sem sessões de confiança, sem utilizadores de confiança e poderás não conseguir ver mensagens anteriores.",
             "restoring": "Restaurar chaves a partir de uma cópia de segurança",
-            "security_key_title": "Chave de recuperação",
-            "security_phrase_incorrect_error": "Não é possível aceder ao armazenamento secreto. Verifica se introduziste a frase de segurança correcta.",
-            "security_phrase_title": "Frase de segurança",
-            "separator": "%(securityKey)s ou %(recoveryFile)s",
-            "use_security_key_prompt": "Utiliza a tua chave de recuperação para continuar."
+            "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_not_ready": "A assinatura cruzada não está configurada.",
-        "cross_signing_ready": "A assinatura cruzada está pronta a ser utilizada.",
-        "cross_signing_ready_no_backup": "A assinatura cruzada está pronta, mas as chaves não têm cópia de segurança.",
         "cross_signing_room_normal": "Esta sala é encriptada de ponta a ponta",
         "cross_signing_room_verified": "Toda a gente nesta sala é verificada",
         "cross_signing_room_warning": "Alguém está a utilizar uma sessão desconhecida",
-        "cross_signing_unsupported": "O teu servidor doméstico não suporta assinatura cruzada.",
-        "cross_signing_untrusted": "A tua conta tem uma identidade de assinatura cruzada no armazenamento secreto, mas ainda não é de confiança para esta sessão.",
         "cross_signing_user_normal": "Não verificaste este utilizador.",
         "cross_signing_user_verified": "Verificaste este utilizador. Este utilizador verificou todas as suas sessões.",
         "cross_signing_user_warning": "Este utilizador não verificou todas as suas sessões.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Chaves de assinatura cruzada claras",
-            "title": "Destrói as chaves de assinatura cruzada?",
-            "warning": "A eliminação das chaves de assinatura cruzada é permanente. Qualquer pessoa com quem tenhas feito a verificação verá alertas de segurança. É quase certo que não vais querer fazer isto, a menos que tenhas perdido todos os dispositivos a partir dos quais podes fazer a assinatura cruzada."
-        },
         "enter_recovery_key": "Introduzir a chave de recuperação",
         "event_shield_reason_authenticity_not_guaranteed": "A autenticidade desta mensagem encriptada não pode ser garantida neste dispositivo.",
         "event_shield_reason_mismatched_sender_key": "Encriptado por uma sessão não verificada",
@@ -938,9 +928,8 @@
             "title": "Novo método de recuperação",
             "warning": "Se não tiveres definido o novo 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."
         },
-        "not_supported": "<não suportado>",
-        "pinned_identity_changed": "A identidade de %(displayName)s (<b>%(userId)s</b> ) parece ter mudado.<a> Saber mais</a>",
-        "pinned_identity_changed_no_displayname": "A identidade de <b>%(userId)s</b> parece ter mudado. <a>Saiba mais</a>",
+        "pinned_identity_changed": "A identidade de %(displayName)s (<b>%(userId)s</b> ) foi alterada. <a> Saber mais</a>",
+        "pinned_identity_changed_no_displayname": "A identidade de <b>%(userId)s</b> foi alterada. <a>Saber mais</a>",
         "recovery_method_removed": {
             "description_1": "Esta sessão detectou que a tua frase de segurança e a chave para as mensagens seguras foram removidas.",
             "description_2": "Se o fizeste acidentalmente, podes configurar as Mensagens seguras nesta sessão, o que criptografará novamente o histórico de mensagens desta sessão com um novo método de recuperação.",
@@ -954,8 +943,7 @@
         "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.",
-            "title": "Configurar"
+            "explainer": "Guarda as tuas chaves antes de saíres para evitar perdê-las."
         },
         "udd": {
             "interactive_verification_button": "Verifica interactivamente por emoji",
@@ -970,7 +958,6 @@
             "accepting": "Aceitando...",
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
-                "reset_confirmation": "Repõe mesmo as chaves de verificação?",
                 "skip_verification": "Ignora a verificação por enquanto",
                 "unable_to_verify": "Não é possível verificar este dispositivo",
                 "verify_this_device": "Verifica este dispositivo"
@@ -1041,8 +1028,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_reset_warning_1": "A reposição das tuas chaves de verificação não pode ser anulada. Após a reposição, não terás acesso a mensagens encriptadas antigas e todos os amigos que te tenham verificado anteriormente verão avisos de segurança até voltares a verificar com eles.",
-            "verify_reset_warning_2": "Só avances se tiveres a certeza de que perdeste todos os teus outros dispositivos e a tua chave de recuperação.",
             "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",
@@ -1053,7 +1038,7 @@
         },
         "verification_requested_toast_title": "Verificação solicitada",
         "verified_identity_changed": "%(displayName)s(<b>%(userId)s</b>) mudou a tua identidade verificada. <a>Saber mais</a>",
-        "verified_identity_changed_no_displayname": "A identidade verificada de <b>%(userId)s</b> foi alterada. <a>Saber mais</a>",
+        "verified_identity_changed_no_displayname": "A identidade de <b>%(userId)s</b> foi alterada. <a>Saber mais</a>",
         "verify_toast_description": "Outros utilizadores podem não confiar nisto",
         "verify_toast_title": "Verifica esta sessão",
         "withdraw_verification_action": "Retirar verificação"
@@ -1111,11 +1096,7 @@
             "title": "Não é possível copiar o link da sala"
         },
         "error_loading_user_profile": "Não foi possível carregar o perfil do utilizador",
-        "forget_room_failed": "Falha ao esquecer a sala %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
-            "title": "Busca falhou"
-        }
+        "forget_room_failed": "Falha ao esquecer a sala %(errCode)s"
     },
     "error_user_not_logged_in": "Utilizador não tem sessão iniciada",
     "event_preview": {
@@ -1240,6 +1221,7 @@
         "change": "Altera o servidor de identidade",
         "change_prompt": "Desligar do servidor de identidade <current /> e ligar a <new /> em vez disso?",
         "change_server_prompt": "Se não pretenderes utilizar <server /> para descobrir e ser descoberto pelos contactos existentes que conheces, introduz outro servidor de identidade abaixo.",
+        "changed": "O teu servidor de identidade foi alterado",
         "checking": "A verificar o servidor",
         "description_connected": "Atualmente, estás a utilizar <server></server> para descobrires e seres descoberto pelos contactos existentes que conheces. Podes alterar o teu servidor de identidade abaixo.",
         "description_disconnected": "Atualmente, não estás a utilizar um servidor de identidade. Para descobrires e seres descoberto pelos contactos existentes que conheces, adiciona um abaixo.",
@@ -1282,7 +1264,9 @@
         "title": "%(brand)s não suporta este browser",
         "use_desktop_heading": "Utiliza antes o %(brand)s Desktop",
         "use_mobile_heading": "Utiliza antes o %(brand)s no telemóvel",
-        "use_mobile_heading_after_desktop": "Ou utiliza a nossa aplicação móvel"
+        "use_mobile_heading_after_desktop": "Ou utiliza a nossa aplicação móvel",
+        "windows_64bit": "Windows (64 bits)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
     },
     "info_tooltip_title": "Informação",
     "integration_manager": {
@@ -1291,6 +1275,7 @@
         "error_connecting_heading": "Não é possível conectar-se ao gerenciador de integração",
         "explainer": "Os gestores de integração recebem dados de configuração e podem modificar widgets, enviar convites para salas e definir níveis de potência em teu nome.",
         "manage_title": "Gere as integrações",
+        "toggle_label": "Ativar o gestor de integração",
         "use_im": "Utiliza um gestor de integração para gerir bots, widgets e pacotes de autocolantes.",
         "use_im_default": "Utiliza um gestor de integração <b>(%(serverName)s)</b> para gerir bots, widgets e pacotes de autocolantes."
     },
@@ -1766,11 +1751,6 @@
         "ongoing": "A remover...",
         "reason_label": "Motivo (opcional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Você tem certeza que deseja rejeitar este convite?",
-        "failed": "Falha ao tentar rejeitar convite",
-        "title": "Rejeitar convite"
-    },
     "report_content": {
         "description": "Ao reportar esta mensagem, envias o seu \"ID de evento\" único para o administrador do teu servidor. Se as mensagens nesta sala estiverem cifradas, o administrador não poderá ler o texto ou ver quaisquer ficheiros ou imagens.",
         "disagree": "Não concordo",
@@ -1976,7 +1956,6 @@
             "you_created": "Tu criaste esta sala."
         },
         "invite_email_mismatch_suggestion": "Partilha este e-mail nas Definições para receberes convites diretamente em %(brand)s.",
-        "invite_reject_ignore": "Rejeitar e ignorar o utilizador",
         "invite_sent_to_email": "Este convite foi enviado para %(email)s",
         "invite_sent_to_email_room": "Este convite para %(roomName)s foi enviado para %(email)s",
         "invite_subtitle": "Convidado por <userName/>",
@@ -2080,20 +2059,54 @@
         "add_space_label": "Adiciona espaço",
         "breadcrumbs_empty": "Nenhuma sala visitada recentemente",
         "breadcrumbs_label": "Salas visitadas recentemente",
+        "empty": {
+            "no_chats": "Ainda sem conversas",
+            "no_chats_description": "Começa a enviar mensagens a alguém ou a crie uma sala",
+            "no_chats_description_no_room_rights": "Começa por enviar uma mensagem a alguém",
+            "no_favourites": "Ainda não tem um conversa favorita",
+            "no_favourites_description": "Pode adicionar uma conversa aos seus favoritos nas definições de conversa",
+            "no_people": "Ainda não tem conversas diretas com ninguém",
+            "no_people_description": "Pode desseleccionar filtros para veres as suas outras conversas",
+            "no_rooms": "Você ainda não está em nenhuma sala",
+            "no_rooms_description": "Pode desmarcar filtros para ver as suas outras conversas",
+            "no_unread": "Parabéns! Não tens nenhuma mensagem por ler",
+            "show_chats": "Mostra todas as conversas"
+        },
         "failed_add_tag": "Falha ao adicionar %(tagName)s à sala",
         "failed_remove_tag": "Não foi possível remover a marcação %(tagName)s desta sala",
         "failed_set_dm_tag": "Falha ao definir a etiqueta de mensagem direta",
+        "filters": {
+            "favourite": "Favoritos",
+            "people": "Pessoas",
+            "rooms": "Salas",
+            "unread": "Não lido"
+        },
         "home_menu_label": "Opções de casa",
         "join_public_room_label": "Participa na sala pública",
         "joining_rooms_status": {
             "one": "Atualmente ingressando%(count)s sala",
             "other": "Atualmente ingressando%(count)s salas"
         },
+        "list_title": "Lista de salas",
+        "more_options": {
+            "copy_link": "Copiar link da sala",
+            "favourited": "Adicionado aos favoritos",
+            "leave_room": "Sair da sala",
+            "low_priority": "Baixa prioridade",
+            "mark_read": "Marcar como lido",
+            "mark_unread": "Marcar como não lido"
+        },
         "notification_options": "Opções de notificação",
+        "open_space_menu": "Abrir menu do espaço",
+        "primary_filters": "Filtros da lista de salas",
         "redacting_messages_status": {
             "one": "Atualmente removendo mensagens na %(count)s sala",
             "other": "Atualmente removendo mensagens em %(count)s salas"
         },
+        "room": {
+            "more_options": "Mais opções",
+            "open_room": "Abrir a sala %(roomName)s"
+        },
         "show_less": "Mostrar menos",
         "show_n_more": {
             "one": "Mostrar %(count)s mais",
@@ -2104,6 +2117,10 @@
         "sort_by_activity": "Atividade",
         "sort_by_alphabet": "A-Z",
         "sort_unread_first": "Mostra primeiro as salas com mensagens não lidas",
+        "space_menu": {
+            "home": "Casa do espaço",
+            "space_settings": "Configurações de espaço"
+        },
         "space_menu_label": "%(spaceName)s menu",
         "sublist_options": "Lista de opções",
         "suggested_rooms_heading": "Salas sugeridas"
@@ -2137,7 +2154,7 @@
             "upgrade_dwarning_ialog_title_public": "Atualizar sala pública",
             "upgrade_warning_dialog_description": "A atualização de uma divisão é uma ação avançada e é normalmente recomendada quando uma divisão está instável devido a erros, funcionalidades em falta ou vulnerabilidades de segurança.",
             "upgrade_warning_dialog_explainer": "<b>Tem em atenção que a atualização fará uma nova versão da sala</b>. Todas as mensagens actuais permanecerão nesta sala arquivada.",
-            "upgrade_warning_dialog_footer": "Actualizarás este quarto de <oldVersion /> para <newVersion />.",
+            "upgrade_warning_dialog_footer": "Esta sala será atualizada de <oldVersion /> para <newVersion />.",
             "upgrade_warning_dialog_invite_label": "Convida automaticamente os membros desta sala para a nova sala",
             "upgrade_warning_dialog_report_bug_prompt": "Normalmente, isto só afecta a forma como a sala é processada no servidor. Se estiveres a ter problemas com o teu %(brand)s, por favor reporta um erro.",
             "upgrade_warning_dialog_report_bug_prompt_link": "Normalmente, isto apenas afecta a forma como a sala é processada no servidor. Se estiveres a ter problemas com o teu %(brand)s, por favor <a>reporta um bug</a>.",
@@ -2277,7 +2294,7 @@
             "encrypted_room_public_confirm_description_1": "<b>Não é recomendável tornar públicas as salas encriptadas.</b> Isso significa que qualquer pessoa pode encontrar e entrar na sala, pelo que qualquer pessoa pode ler as mensagens. Não terás nenhum dos benefícios da encriptação. Encriptar mensagens numa sala pública tornará a receção e o envio de mensagens mais lento.",
             "encrypted_room_public_confirm_description_2": "Para evitar estes problemas, cria uma <a>nova sala pública</a> para a conversa que pretendes ter.",
             "encrypted_room_public_confirm_title": "Tens a certeza de que queres tornar pública esta sala encriptada?",
-            "encryption_forced": "O teu servidor requer que a encriptação seja desactivada.",
+            "encryption_forced": "O servidor requer que a encriptação seja desativada.",
             "encryption_permanent": "Uma vez activada, a encriptação não pode ser desactivada.",
             "error_join_rule_change_title": "Falha ao atualizar as regras de adesão",
             "error_join_rule_change_unknown": "Falha desconhecida",
@@ -2332,7 +2349,7 @@
             "public_without_alias_warning": "Para estabelecer uma ligação a esta sala, adiciona um endereço.",
             "publish_room": "Torna esta sala visível no diretório público de salas.",
             "publish_space": "Torna este espaço visível no diretório de salas públicas.",
-            "strict_encryption": "Nunca envia mensagens encriptadas para sessões não verificadas nesta sala a partir desta sessão",
+            "strict_encryption": "Enviar mensagens apenas a utilizadores verificados.",
             "title": "Segurança e privacidade"
         },
         "title": "Configurações da sala -%(roomName)s",
@@ -2466,20 +2483,35 @@
                 "breadcrumb_title_forgot": "Esqueceu-se da sua chave de recuperação? Terá de repor a sua identidade.",
                 "breadcrumb_warning": "Faz isto apenas se acreditares que a tua conta foi comprometida.",
                 "details_title": "Detalhes da encriptação",
+                "do_not_close_warning": "Não feches esta janela até que a reposição esteja concluída",
                 "export_keys": "Exportar chaves",
                 "import_keys": "Importar chaves",
                 "other_people_device_description": "Por predefinição, nas salas encriptadas, não envies mensagens encriptadas a ninguém até as teres verificado",
                 "other_people_device_label": "Nunca enviar mensagens encriptadas para dispositivos não verificados",
                 "other_people_device_title": "Dispositivos de outras pessoas",
                 "reset_identity": "Redefinir identidade criptográfica",
+                "reset_in_progress": "Reposição em curso...",
                 "session_id": "ID da sessão:",
                 "session_key": "Chave da sessão:",
                 "title": "Avançadas"
             },
+            "delete_key_storage": {
+                "breadcrumb_page": "Excluir armazenamento de chaves",
+                "confirm": "Excluir armazenamento de chaves",
+                "description": "A exclusão do armazenamento de chaves removerá sua identidade criptográfica e chaves de mensagem do servidor e desativará os seguintes recursos de segurança:",
+                "list_first": "Você não terá histórico de mensagens criptografadas em novos dispositivos",
+                "list_second": "Irá perder o acesso às suas mensagens encriptadas se se desconectar de %(brand)s em qualquer lugar",
+                "title": "Tem certeza de que deseja desativar o armazenamento de chaves e excluí-lo?"
+            },
             "device_not_verified_button": "Verificar este dispositivo",
             "device_not_verified_description": "Você precisa verificar este dispositivo para visualizar suas configurações de criptografia.",
             "device_not_verified_title": "Dispositivo não verificado",
             "dialog_title": "<strong>Configurações:</strong> Encriptação",
+            "key_storage": {
+                "allow_key_storage": "Permitir armazenamento de chaves",
+                "description": "Armazene sua identidade criptográfica e chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em quaisquer novos dispositivos. <a>Saiba mais</a>",
+                "title": "Armazenamento de chaves"
+            },
             "recovery": {
                 "change_recovery_confirm_button": "Confirmar nova chave de recuperação",
                 "change_recovery_confirm_description": "Introduz a tua nova chave de recuperação abaixo para terminar. A tua chave antiga deixará de funcionar.",
@@ -2591,7 +2623,6 @@
             "unable_to_load_msisdns": "Não é possível carregar números de telefone",
             "username": "Nome de utilizador"
         },
-        "image_thumbnails": "Mostrar pré-visualizações/miniaturas de imagens",
         "inline_url_previews_default": "Ativar pré-visualizações de URL embutidas por predefinição",
         "inline_url_previews_room": "Ativar pré-visualizações de URL por defeito para os participantes nesta sala",
         "inline_url_previews_room_account": "Ativar pré-visualizações URL para esta sala (só te afeta a ti)",
@@ -2739,57 +2770,20 @@
         "prompt_invite": "Avisa antes de enviar convites para IDs de matrix potencialmente inválidos",
         "replace_plain_emoji": "Substituir Emoji de texto automaticamente",
         "security": {
-            "4s_public_key_in_account_data": "nos dados da conta",
-            "4s_public_key_status": "Chave pública de armazenamento secreto:",
             "analytics_description": "Partilha dados anónimos para nos ajudar a identificar problemas. Nada de pessoal. Sem terceiros.",
-            "backup_key_cached_status": "Chave de backup armazenada em cache:",
-            "backup_key_stored_status": "Chave de backup armazenada:",
-            "backup_key_unexpected_type": "tipo inesperado",
-            "backup_key_well_formed": "bem formado",
-            "backup_keys_description": "Faça backup de suas chaves de criptografia com os dados da sua conta para o caso de perder o acesso às suas sessões. As suas chaves serão protegidas com uma chave de recuperação exclusiva.",
             "bulk_options_accept_all_invites": "Aceita todos os convites de %(invitedRooms)s ",
             "bulk_options_reject_all_invites": "Rejeitar todos os %(invitedRooms)s convites",
             "bulk_options_section": "Opções em massa",
-            "cross_signing_cached": "armazenado em cache localmente",
-            "cross_signing_homeserver_support": "Suporte a recursos de servidor doméstico:",
-            "cross_signing_homeserver_support_exists": "existe",
-            "cross_signing_in_4s": "em armazenamento secreto",
-            "cross_signing_in_memory": "na memória",
-            "cross_signing_master_private_Key": "Chave mestra privada:",
-            "cross_signing_not_cached": "não encontrado localmente",
-            "cross_signing_not_found": "não encontrado",
-            "cross_signing_not_in_4s": "não encontrado no armazenamento",
-            "cross_signing_not_stored": "não armazenado",
-            "cross_signing_private_keys": "Assinatura cruzada de chaves privadas:",
-            "cross_signing_public_keys": "Assinatura cruzada de chaves públicas:",
-            "cross_signing_self_signing_private_key": "Chave privada com assinatura automática:",
-            "cross_signing_user_signing_private_key": "Chave privada de assinatura do utilizador:",
-            "cryptography_section": "Criptografia",
             "dehydrated_device_description": "A funcionalidade de dispositivo offline permite-te receber mensagens encriptadas mesmo quando não tens sessão iniciada em nenhum dispositivo",
             "dehydrated_device_enabled": "Dispositivo offline ativado",
-            "delete_backup": "Eliminar cópia de segurança",
-            "delete_backup_confirm_description": "Tens a certeza? Perderás as tuas mensagens encriptadas se as tuas chaves não forem guardadas corretamente.",
             "dialog_title": "<strong>Definições:</strong> Segurança e privacidade",
             "e2ee_default_disabled_warning": "O administrador do teu servidor desactivou a encriptação de ponta a ponta por defeito nas salas privadas e nas Mensagens directas.",
             "enable_message_search": "Ativar a pesquisa de mensagens em salas encriptadas",
             "encryption_section": "Encriptação",
-            "error_loading_key_backup_status": "Não é possível carregar o estado da cópia de segurança da chave",
-            "export_megolm_keys": "Exportar chaves ponta-a-ponta da sala",
             "ignore_users_empty": "Não tens utilizadores ignorados.",
             "ignore_users_section": "Utilizadores ignorados",
-            "import_megolm_keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
-            "key_backup_active": "Esta sessão está a realizar as cópias de segurança das tuas chaves.",
-            "key_backup_active_version": "Versão de cópia de segurança ativa:",
-            "key_backup_active_version_none": "Nenhum",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_can_be_restored": "Esta cópia de segurança pode ser restaurada nesta sessão",
-            "key_backup_complete": "Cópia de segurança de todas as chaves realizada",
             "key_backup_connect": "Liga esta sessão à cópia de segurança das chaves",
-            "key_backup_connect_prompt": "Liga esta sessão à cópia de segurança de chaves antes de terminares a sessão para evitar perderes quaisquer chaves que possam estar apenas nesta sessão.",
-            "key_backup_in_progress": "Fazendo backup das chaves de %(sessionsRemaining)s...",
-            "key_backup_inactive": "Esta sessão não <b>está a realizar as cópias de segurança das tuas chaves</b>, mas tens uma cópia de segurança existente a partir da qual podes restaurar e adicionar mais.",
-            "key_backup_inactive_warning": "As tuas chaves <b>não estão a ser copiadas em segurança a partir desta sessão</b>.",
-            "key_backup_latest_version": "Versão mais recente da cópia de segurança no servidor:",
             "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": {
@@ -2809,14 +2803,8 @@
             "message_search_unsupported": "%(brand)s não tem alguns componentes necessários para guardar mensagens encriptadas localmente de forma segura. Se quiseres experimentar esta funcionalidade, constrói um ambiente de trabalho %(brand)s personalizado com <nativeLink>componentes de pesquisa adicionados</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s não é possível armazenar mensagens encriptadas em cache com segurança localmente durante a execução num navegador da Web. Usa <desktopLink>%(brand)s Desktop</desktopLink> para que as mensagens encriptadas apareçam nos resultados da pesquisa.",
             "record_session_details": "Grava o nome do cliente, a versão e o URL para reconhecer mais facilmente as sessões no gestor de sessões",
-            "restore_key_backup": "Restaurar a partir da cópia de segurança",
-            "secret_storage_not_ready": "não está pronto",
-            "secret_storage_ready": "pronto",
-            "secret_storage_status": "Armazenamento secreto:",
             "send_analytics": "Envia dados analíticos",
-            "session_id": "Identificação de sessão:",
-            "session_key": "Chave da sessão:",
-            "strict_encryption": "Nunca envies mensagens encriptadas para sessões não verificadas a partir desta sessão"
+            "strict_encryption": "Enviar mensagens apenas a utilizadores verificados"
         },
         "send_read_receipts": "Enviar recibos lidos",
         "send_read_receipts_unsupported": "O teu servidor não suporta a desativação do envio de recibos de leitura.",
@@ -3058,8 +3046,6 @@
         "topic": "Obtém ou define o tópico da sala",
         "topic_none": "Esta sala não tem tópico.",
         "topic_room_error": "Falha ao obter o tópico da sala: Não foi possível encontrar a sala (%(roomId)s",
-        "tovirtual": "Muda para a sala virtual desta sala, se houver uma",
-        "tovirtual_not_found": "Não há sala virtual para esta sala",
         "unban": "Cancela o utilizador com um determinado ID",
         "unflip": "Pré-anexa ┬──┬ ノ( ゜-゜ノ) a uma mensagem de texto simples",
         "unholdcall": "Tira a chamada da sala atual da espera",
@@ -3077,6 +3063,7 @@
         "view": "Visualiza a sala com o endereço indicado",
         "whois": "Apresenta informações sobre um utilizador"
     },
+    "sliding_sync_legacy_no_longer_supported": "A Sliding Sync Legacy não é mais suportada: faça logout e login novamente para ativar a nova opção de Sliding Sync",
     "space": {
         "add_existing_room_space": {
             "create": "Queres acrescentar uma nova sala em vez disso?",
@@ -3181,7 +3168,6 @@
         "heading_without_query": "Pesquisar por",
         "join_button_text": "Aderir %(roomAddress)s",
         "keyboard_scroll_hint": "Utiliza <arrows/> para te deslocares",
-        "message_search_section_title": "Outras pesquisas",
         "other_rooms_in_space": "Outras salas em %(spaceName)s",
         "public_rooms_label": "Salas públicas",
         "public_spaces_label": "Espaços públicos",
@@ -3191,7 +3177,6 @@
         "result_may_be_hidden_privacy_warning": "Alguns resultados podem estar ocultos por motivos de privacidade",
         "result_may_be_hidden_warning": "Alguns resultados podem estar ocultos",
         "search_dialog": "Diálogo de pesquisa",
-        "search_messages_hint": "Para procurar mensagens, procura este ícone na parte superior de uma sala <icon/>",
         "spaces_title": "Espaços em que te encontras",
         "start_group_chat_button": "Inicia uma conversa de grupo"
     },
@@ -3240,9 +3225,7 @@
     "threads_activity_centre": {
         "header": "Atividade de tópicos",
         "no_rooms_with_threads_notifs": "Ainda não tens salas com notificações de tópicos.",
-        "no_rooms_with_unread_threads": "Ainda não tens salas com tópicos não lidos.",
-        "release_announcement_description": "As notificações de tópicos foram movidas, encontre-as aqui a partir de agora.",
-        "release_announcement_header": "Centro de Actividades Tópicos"
+        "no_rooms_with_unread_threads": "Ainda não tens salas com tópicos não lidos."
     },
     "time": {
         "about_day_ago": "há cerca de um dia",
@@ -3454,6 +3437,7 @@
             "left_reason": "%(targetName)s saiu da sala:%(reason)s",
             "no_change": "%(senderName)s não fez nenhuma alteração",
             "reject_invite": "%(targetName)s rejeitou o convite",
+            "reject_invite_reason": "%(targetName)s rejeitou o convite: %(reason)s",
             "remove_avatar": "%(senderName)s removeu a sua fotografia de perfil",
             "remove_name": "%(senderName)s removeu o seu nome de apresentação (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s colocou uma foto de perfil",
@@ -4048,7 +4032,7 @@
         "error_need_to_be_logged_in": "Você tem que estar logado.",
         "error_unable_start_audio_stream_description": "Não é possível iniciar a transmissão de áudio.",
         "error_unable_start_audio_stream_title": "Falha ao iniciar a transmissão ao vivo",
-        "modal_data_warning": "Os dados neste ecrã são partilhados com %(widgetDomain)s",
+        "modal_data_warning": "Os dados abaixo são partilhados com %(widgetDomain)s",
         "modal_title_default": "Widget Modal",
         "no_name": "Aplicação desconhecida",
         "open_id_permissions_dialog": {
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 76f50ef241..f95696b3e5 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -12,6 +12,16 @@
             "one": "1 menção não lida."
         },
         "recent_rooms": "Salas recentes",
+        "room_messsage_not_sent": "Abra a sala %(roomName)s com uma mensagem não enviada.",
+        "room_n_unread_invite": "Abra o convite da sala %(roomName)s.",
+        "room_n_unread_messages": {
+            "one": "Sala aberta %(roomName)s com 1 mensagem não lida.",
+            "other": "Sala aberta %(roomName)s com mensagens %(count)s não lidas."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Sala aberta %(roomName)s com 1 menção não lida.",
+            "other": "Sala aberta %(roomName)s com mensagens %(count)s não lidas, incluindo menções."
+        },
         "room_name": "Sala %(name)s",
         "room_status_bar": "Barra de status da sala",
         "seek_bar_label": "Barra de busca de áudio",
@@ -35,7 +45,7 @@
         "click": "Clicar",
         "click_to_copy": "Clique para copiar",
         "close": "Fechar",
-        "collapse": "Colapsar",
+        "collapse": "Recolher",
         "complete": "Concluir",
         "confirm": "Confirmar",
         "continue": "Continuar",
@@ -45,6 +55,8 @@
         "create_a_room": "Criar uma sala",
         "create_account": "Criar Conta",
         "decline": "Recusar",
+        "decline_and_block": "Recusar e bloquear",
+        "decline_invite": "Recusar convite",
         "delete": "Excluir",
         "deny": "Negar",
         "disable": "Desativar",
@@ -60,10 +72,11 @@
         "explore_public_rooms": "Explorar salas públicas",
         "explore_rooms": "Explorar salas",
         "export": "Exportar",
-        "forward": "Avançar",
+        "forward": "Encaminhar",
         "go": "Próximo",
         "go_back": "Voltar",
         "got_it": "Ok, entendi",
+        "hide": "Ocultar",
         "hide_advanced": "Esconder configurações avançadas",
         "hold": "Pausar",
         "ignore": "Bloquear",
@@ -80,12 +93,14 @@
         "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",
         "no": "Não",
         "ok": "Ok",
         "open": "Abrir",
+        "open_menu": "Abrir menu",
         "pause": "Pausar",
         "pin": "Alfinete",
         "play": "Reproduzir",
@@ -94,13 +109,13 @@
         "react": "Adicionar reação",
         "refresh": "Recarregar",
         "register": "Registre-se",
-        "reject": "Recusar",
         "reload": "Recarregar",
         "remove": "Apagar",
         "rename": "Renomear",
         "reply": "Responder",
         "reply_in_thread": "Responder no tópico",
         "report_content": "Denunciar conteúdo",
+        "report_room": "Reportar sala",
         "resend": "Reenviar",
         "reset": "Redefinir",
         "resume": "Retomar",
@@ -110,6 +125,7 @@
         "save": "Salvar",
         "search": "Buscar",
         "send_report": "Enviar relatório",
+        "set_avatar": "Definir foto do perfil",
         "share": "Compartilhar",
         "show": "Mostrar",
         "show_advanced": "Mostrar configurações avançadas",
@@ -141,6 +157,7 @@
         "view_message": "Ver mensagem",
         "view_source": "Ver código-fonte",
         "yes": "Sim",
+        "yes_dismiss": "Sim, dispensar",
         "zoom_in": "Aumentar zoom",
         "zoom_out": "Diminuir zoom"
     },
@@ -228,6 +245,7 @@
         },
         "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",
+        "mobile_create_account_title": "Você está prestes a criar uma conta em %(hsName)s",
         "msisdn_field_description": "Outros usuários podem convidá-lo para salas usando seus detalhes de contato",
         "msisdn_field_label": "Telefone",
         "msisdn_field_number_invalid": "Esse número de telefone não é válido, verifique e tente novamente",
@@ -245,15 +263,40 @@
         "phone_label": "Telefone",
         "phone_optional_label": "Número de celular (opcional)",
         "qr_code_login": {
+            "check_code_explainer": "Isso verificará se a conexão com seu outro dispositivo é segura.",
+            "check_code_heading": "Digite o número mostrado em seu outro dispositivo",
             "check_code_input_label": "Código de 2 dígitos",
             "check_code_mismatch": "Os números não coincidem",
             "completing_setup": "Concluindo a configuração do seu novo dispositivo",
+            "error_etag_missing": "Ocorreu um erro inesperado. Isso pode ser devido a uma extensão do navegador, servidor proxy ou configuração incorreta do servidor.",
+            "error_expired": "O login expirou. Por favor, tente novamente.",
+            "error_expired_title": "O login não foi concluído a tempo",
+            "error_insecure_channel_detected": "Não foi possível estabelecer uma conexão segura com o novo dispositivo. Seus dispositivos existentes ainda estão seguros e você não precisa se preocupar com eles.",
             "error_insecure_channel_detected_instructions": "E agora?",
+            "error_insecure_channel_detected_instructions_1": "Tente entrar no outro dispositivo novamente com um código QR, caso seja um problema de rede",
+            "error_insecure_channel_detected_instructions_2": "Se o problema persistir, tente uma rede Wi-Fi diferente ou use seus dados móveis em vez de Wi-Fi",
+            "error_insecure_channel_detected_instructions_3": "Se isso não funcionar, faça login manualmente",
+            "error_insecure_channel_detected_title": "Conexão não segura",
+            "error_other_device_already_signed_in": "Você não precisa fazer mais nada.",
+            "error_other_device_already_signed_in_title": "Seu outro dispositivo já está conectado",
+            "error_rate_limited": "Muitas tentativas em um curto espaço de tempo. Aguarde algum tempo antes de tentar novamente.",
             "error_unexpected": "Ocorreu um erro inesperado. A solicitação para conectar seu outro dispositivo foi cancelada.",
+            "error_unsupported_protocol": "Este dispositivo não suporta o login em outro dispositivo com um código QR.",
+            "error_unsupported_protocol_title": "Outro dispositivo não compatível",
+            "error_user_cancelled": "O login foi cancelado no outro dispositivo.",
+            "error_user_cancelled_title": "Solicitação de login cancelada",
+            "error_user_declined": "Você ou o provedor da conta recusaram a solicitação de login.",
             "error_user_declined_title": "Login recusado",
+            "follow_remaining_instructions": "Siga as instruções restantes",
+            "open_element_other_device": "Abra %(brand)s em seu outro dispositivo",
+            "point_the_camera": "Escaneie o código QR mostrado aqui",
             "scan_code_instruction": "Digitalize o código QR com outro dispositivo",
             "scan_qr_code": "Iniciar sessão com código QR",
+            "security_code": "Código de segurança",
+            "security_code_prompt": "Se solicitado, insira o código abaixo em seu outro dispositivo.",
             "select_qr_code": "Selecione \"%(scanQRCode)s”",
+            "unsupported_explainer": "Seu provedor de conta não suporta o login em um novo dispositivo com um código QR.",
+            "unsupported_heading": "Código QR não suportado",
             "waiting_for_device": "Aguardando o login do dispositivo"
         },
         "register_action": "Criar Conta",
@@ -323,7 +366,7 @@
             "clear_data_description": "Apagar todos os dados desta sessão é uma ação permanente. Mensagens criptografadas serão perdidas, a não ser que as chaves delas tenham sido copiadas para o backup.",
             "clear_data_title": "Limpar todos os dados nesta sessão?"
         },
-        "soft_logout_heading": "Você está desconectada/o",
+        "soft_logout_heading": "Você está desconectado",
         "soft_logout_intro_password": "Digite sua senha para entrar e recuperar o acesso à sua conta.",
         "soft_logout_intro_sso": "Entre e recupere o acesso à sua conta.",
         "soft_logout_intro_unsupported_auth": "Você não pôde se conectar na sua conta. Entre em contato com o administrador do servidor para obter mais informações.",
@@ -342,6 +385,9 @@
             "email_resend_prompt": "Não recebeu?<a> Reenvie</a>",
             "email_resent": "Reenviar!",
             "fallback_button": "Iniciar autenticação",
+            "mas_cross_signing_reset_cta": "Vá para sua conta",
+            "mas_cross_signing_reset_description": "Redefina sua identidade por meio do provedor da conta e, em seguida, volte e clique em “Tentar novamente”.",
+            "mas_cross_signing_reset_title": "Acesse sua conta para redefinir sua identidade",
             "msisdn": "Uma mensagem de texto foi enviada para %(msisdn)s",
             "msisdn_token_incorrect": "Token incorreto",
             "msisdn_token_prompt": "Por favor, entre com o código que está na mensagem:",
@@ -371,25 +417,34 @@
         "before_submitting": "Antes de enviar os relatórios, você deve <a>criar um bilhete de erro no GitHub</a> para descrever seu problema.",
         "collecting_information": "Coletando informação sobre a versão do app",
         "collecting_logs": "Coletando logs",
-        "create_new_issue": "Por favor, <newIssueLink>crie um novo bilhete de erro</newIssueLink> no GitHub para que possamos investigar esta falha.",
+        "create_new_issue": "Por favor, <newIssueLink>crie um novo ticket de erro</newIssueLink> no GitHub para que possamos investigar esta falha.",
         "description": "Os logs de depuração contêm dados de uso do aplicativo, incluindo seu nome de usuário, os IDs ou aliases das salas que você visitou, com quais elementos da IU você interagiu pela última vez e os nomes de usuários de outros usuários. Eles não contêm mensagens.",
-        "download_logs": "Baixar relatórios",
-        "downloading_logs": "Baixando relatórios",
-        "error_empty": "Por favor, diga-nos o que aconteceu de errado ou, ainda melhor, crie um bilhete de erro no GitHub que descreva o problema.",
-        "github_issue": "Bilhete de erro no GitHub",
+        "download_logs": "Baixar logs",
+        "downloading_logs": "Baixando logs",
+        "error_empty": "Por favor, diga-nos o que aconteceu de errado ou, ainda melhor, crie um ticket de erro no GitHub que descreva o problema.",
+        "failed_download_logs": "Falha ao baixar os logs: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Seu relatório de bug foi rejeitado. O servidor rageshake não suporta esse aplicativo.",
+            "rejected_generic": "Seu relatório de bug foi rejeitado. O servidor rageshake rejeitou o conteúdo do relatório devido a uma política.",
+            "rejected_recovery_key": "Seu relatório de bug foi rejeitado por motivos de segurança, pois continha uma chave de recuperação.",
+            "rejected_version": "Seu relatório de bug foi rejeitado porque a versão que você está executando é muito antiga.",
+            "server_unknown_error": "O servidor rageshake encontrou um erro desconhecido e não conseguiu lidar com o relatório.",
+            "unknown_error": "Falha ao enviar logs."
+        },
+        "github_issue": "Ticket de erro no GitHub",
         "introduction": "Se você enviou um bug pelo GitHub, os logs de depuração podem nos ajudar a rastrear o problema. ",
-        "log_request": "Para nos ajudar a evitar isso no futuro, <a>envie-nos os relatórios</a>.",
-        "logs_sent": "Relatórios enviados",
+        "log_request": "Para nos ajudar a evitar que isso aconteça no futuro, <a>envie-nos logs</a>.",
+        "logs_sent": "Logs enviados",
         "matrix_security_issue": "Para relatar um problema de segurança relacionado à tecnologia Matrix, leia a <a>Política de Divulgação de Segurança</a> da Matrix.org.",
-        "preparing_download": "Preparando os relatórios para download",
-        "preparing_logs": "Preparando para enviar relatórios",
-        "send_logs": "Enviar relatórios",
-        "submit_debug_logs": "Enviar relatórios de erros",
+        "preparing_download": "Preparando para baixar logs",
+        "preparing_logs": "Preparando para enviar logs",
+        "send_logs": "Enviar logs",
+        "submit_debug_logs": "Enviar logs de depuração",
         "textarea_label": "Notas",
         "thank_you": "Obrigado!",
         "title": "Relato de Erros",
         "unsupported_browser": "Lembrete: seu navegador não é compatível; portanto, sua experiência pode ser imprevisível.",
-        "uploading_logs": "Enviando relatórios",
+        "uploading_logs": "Enviando logs",
         "waiting_for_server": "Aguardando a resposta do servidor"
     },
     "cannot_invite_without_identity_server": "Não é possível convidar usuários por e-mail sem um servidor de identidade. Você pode se conectar a um em “Configurações”.",
@@ -415,6 +470,7 @@
         "access_token": "Símbolo de acesso",
         "accessibility": "Acessibilidade",
         "advanced": "Avançado",
+        "all_chats": "Todos os bate-papos",
         "analytics": "Análise",
         "and_n_others": {
             "one": "e um outro...",
@@ -433,7 +489,6 @@
         "capabilities": "Capacidades",
         "copied": "Copiado!",
         "credits": "Licenças",
-        "cross_signing": "Autoverificação",
         "dark": "Escuro",
         "description": "Descrição",
         "deselect_all": "Desmarcar todos",
@@ -451,7 +506,7 @@
         "forward_message": "Encaminhar",
         "general": "Geral",
         "go_to_settings": "Ir para as configurações",
-        "guest": "Convidada(o)",
+        "guest": "Convidado",
         "help": "Ajuda",
         "historical": "Histórico",
         "home": "Início",
@@ -469,8 +524,10 @@
         "matrix": "Matrix",
         "message": "Mensagem",
         "message_layout": "Aparência da mensagem",
+        "message_timestamp_invalid": "Data/hora inválido",
         "microphone": "Microfone",
         "model": "Modelo",
+        "moderation_and_safety": "Moderação e segurança",
         "modern": "Moderno",
         "mute": "Mudo",
         "n_members": {
@@ -506,10 +563,13 @@
         "qr_code": "Código QR",
         "random": "Aleatório",
         "reactions": "Reações",
+        "recommended": "Recomendado",
         "report_a_bug": "Reportar um erro",
         "room": "Sala",
         "room_name": "Nome da sala",
         "rooms": "Salas",
+        "save": "Salvar",
+        "saved": "Salvo",
         "saving": "Salvando...",
         "secure_backup": "Backup online",
         "select_all": "Selecionar tudo",
@@ -536,6 +596,7 @@
         "unnamed_room": "Sala sem nome",
         "unnamed_space": "Espaço sem nome",
         "unverified": "Não verificado",
+        "updating": "Atualizando…",
         "user": "Usuário",
         "user_avatar": "Foto de perfil",
         "username": "Nome de usuário",
@@ -556,9 +617,11 @@
             "notification_a11y": "Notificação do preenchimento automático",
             "notification_description": "Notificação da sala",
             "room_a11y": "Preenchimento automático de sala",
+            "space_a11y": "Preenchimento automático de espaço",
             "user_a11y": "Preenchimento automático de usuário",
             "user_description": "Usuários"
         },
+        "close_sticker_picker": "Ocultar stickers",
         "edit_composer_label": "Editar mensagem",
         "format_bold": "Negrito",
         "format_code_block": "Bloco de código",
@@ -573,12 +636,15 @@
         "format_strikethrough": "Riscado",
         "format_underline": "Sublinhar",
         "format_unordered_list": "Lista com marcadores",
+        "formatting_toolbar_label": "Formatação",
         "link_modal": {
             "link_field_label": "Ligação",
             "text_field_label": "Texto",
             "title_create": "Criar uma ligação",
             "title_edit": "Editar ligação"
         },
+        "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…",
@@ -586,6 +652,7 @@
         "placeholder_reply_encrypted": "Digite sua resposta criptografada…",
         "placeholder_thread": "Responder ao tópico…",
         "placeholder_thread_encrypted": "Responder ao tópico criptografado…",
+        "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",
@@ -594,8 +661,12 @@
         "send_button_title": "Enviar mensagem",
         "send_button_voice_message": "Enviar uma mensagem de voz",
         "send_voice_message": "Enviar uma mensagem de voz",
-        "stop_voice_message": "Parar a gravação"
+        "stop_voice_message": "Parar a gravação",
+        "voice_message_button": "Mensagem de voz"
     },
+    "console_dev_note": "Se você sabe o que está fazendo, o Element é de código aberto, não deixe de conferir nosso GitHub (https://github.com/vector-im/element-web/) e contribuir!",
+    "console_scam_warning": "Se alguém lhe disse para copiar/colar algo aqui, há uma grande probabilidade de você estar sendo enganado!",
+    "console_wait": "Aguarde!",
     "create_room": {
         "action_create_room": "Criar sala",
         "action_create_video_room": "Criar sala de vídeo",
@@ -628,22 +699,45 @@
         "add_details_prompt": "Adicione alguns detalhes para ajudar as pessoas a reconhecê-lo.",
         "add_details_prompt_2": "Você pode mudá-los a qualquer instante.",
         "add_existing_rooms_description": "Escolha salas ou conversas para adicionar. Este é apenas um espaço para você, ninguém será informado. Você pode adicionar mais posteriormente.",
+        "add_existing_rooms_heading": "O que você deseja organizar?",
         "address_label": "Endereço",
         "address_placeholder": "e.g. meu-espaco",
+        "creating": "Criando...",
+        "creating_rooms": "Criando salas...",
+        "done_action": "Ir para o meu espaço",
+        "done_action_first_room": "Ir para minha primeira sala",
+        "explainer": "Os espaços são uma nova forma de agrupar salas e pessoas. Que tipo de espaço você quer criar? Você pode mudar isso mais tarde.",
         "failed_create_initial_rooms": "Falha ao criar salas de espaço iniciais",
+        "failed_invite_users": "Falha ao convidar os seguintes usuários para seu espaço: %(csvUsers)s",
         "invite_teammates_by_username": "Convidar por nome de usuário",
+        "invite_teammates_description": "Certifique-se de que as pessoas certas tenham acesso. Você pode convidar mais tarde.",
+        "invite_teammates_heading": "Convide seus colegas de equipe",
         "inviting_users": "Convidando...",
         "label": "Criar um espaço",
         "name_required": "Por favor entre o nome do espaço",
         "personal_space": "Apenas eu",
-        "private_description": "Somente convite, melhor para si mesmo(a) ou para equipes",
+        "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_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",
+        "private_space_description": "Um espaço privado para você e seus colegas de equipe",
         "public_description": "Abra espaços para todos, especialmente para comunidades",
         "public_heading": "O seu espaço público",
         "search_public_button": "Pesquise espaços públicos",
+        "setup_rooms_community_description": "Vamos criar uma sala para cada um deles.",
+        "setup_rooms_community_heading": "O que você gostaria de discutir em %(spaceName)s?",
+        "setup_rooms_description": "Você também pode adicionar mais tarde, incluindo os já existentes.",
+        "setup_rooms_private_description": "Criaremos salas para cada um deles.",
+        "setup_rooms_private_heading": "Em quais projetos sua equipe está trabalhando?",
+        "share_description": "No momento é só você, será ainda melhor com outros.",
+        "share_heading": "Compartilhar %(name)s",
         "skip_action": "Ignorar por enquanto",
+        "subspace_adding": "Adicionando...",
         "subspace_beta_notice": "Adicionar um espaço à um espaço que você gerencia.",
         "subspace_dropdown_title": "Criar um espaço",
+        "subspace_existing_space_prompt": "Em vez disso, quer adicionar um espaço existente?",
         "subspace_join_rule_invite_description": "Apenas convidados poderão encontrar e entrar neste espaço.",
         "subspace_join_rule_invite_only": "Espaço privado (apenas com convite)",
         "subspace_join_rule_label": "Visibilidade do Espaço",
@@ -655,12 +749,58 @@
         "twemoji": "A arte do <twemoji> emoji </twemoji> Twemoji é © <author> Twitter, Inc e outros colaboradores </author> usados sob os termos da CC-BY 4.0. <terms> </terms>",
         "twemoji_colr": "A fonte <colr>twemoji-colr</colr> é © <author>Mozilla Foundation</author> usada sob os termos de <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Tem certeza de que deseja recusar o convite para participar de \"%(roomName)s“?",
+        "ignore_user_help": "Você não verá nenhuma mensagem ou convite para salas desse usuário.",
+        "reason_description": "Descreva o motivo da denúncia da sala.",
+        "report_room_description": "Denuncie esta sala ao provedor da sua conta.",
+        "title": "Recusar convite"
+    },
+    "desktop_default_device_name": "%(brand)sÁrea de trabalho: %(platformName)s",
     "devtools": {
         "active_widgets": "Widgets ativados",
         "category_other": "Outros",
         "category_room": "Sala",
         "caution_colon": "Atenção:",
         "client_versions": "Versões do cliente",
+        "crypto": {
+            "4s_public_key_in_account_data": "nos dados de conta",
+            "4s_public_key_not_in_account_data": "não encontrado",
+            "4s_public_key_status": "Chave pública do armazenamento secreto:",
+            "backup_key_cached": "armazenado localmente",
+            "backup_key_cached_status": "Backup da chave em cache:",
+            "backup_key_not_stored": "não armazenado",
+            "backup_key_stored": "em armazenamento secreto",
+            "backup_key_stored_status": "Backup da chave armazenada:",
+            "backup_key_unexpected_type": "tipo inesperado",
+            "backup_key_well_formed": "bem formado",
+            "cross_signing": "Assinatura cruzada",
+            "cross_signing_cached": "armazenado localmente",
+            "cross_signing_not_ready": "A assinatura cruzada não está configurada.",
+            "cross_signing_private_keys_in_storage": "em armazenamento secreto",
+            "cross_signing_private_keys_in_storage_status": "Chaves privadas de assinatura cruzada:",
+            "cross_signing_private_keys_not_in_storage": "não encontrado no armazenamento",
+            "cross_signing_public_keys_on_device": "na memória",
+            "cross_signing_public_keys_on_device_status": "Chaves públicas de assinatura cruzada:",
+            "cross_signing_ready": "A assinatura cruzada está pronta para ser usada.",
+            "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",
+            "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.",
+            "key_backup_latest_version": "Versão mais recente do backup no servidor:",
+            "key_storage": "Armazenamento de chaves",
+            "master_private_key_cached_status": "Chave privada principal:",
+            "not_found": "não encontrado",
+            "not_found_locally": "não encontrado localmente",
+            "secret_storage_not_ready": "não está pronto",
+            "secret_storage_ready": "pronto",
+            "secret_storage_status": "Armazenamento secreto:",
+            "self_signing_private_key_cached_status": "Chave privada auto-assinada:",
+            "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",
         "edit_setting": "Editar configuração",
@@ -680,6 +820,8 @@
         "id": "ID: ",
         "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",
         "no_receipt_found": "Nenhum recibo encontrado",
         "notification_state": "O estado da notificação é<strong>%(notificationState)s</strong>",
@@ -714,6 +856,9 @@
         "setting_colon": "Configuração:",
         "setting_definition": "Definição da configuração:",
         "setting_id": "ID da configuração",
+        "settings": {
+            "elementCallUrl": "URL de chamada do Element"
+        },
         "settings_explorer": "Explorador de configurações",
         "show_hidden_events": "Mostrar eventos ocultos nas conversas",
         "spaces": {
@@ -724,6 +869,7 @@
         "thread_root_id": "ID raiz do tópico: %(threadRootId)s",
         "threads_timeline": "Linha do tempo dos tópicos",
         "title": "Ferramentas de desenvolvimento",
+        "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_read_up_to": "O usuário leu até: ",
@@ -740,6 +886,7 @@
         "values_explicit_this_room_colon": "Valores em níveis explícitos nessa sala:",
         "view_servers_in_room": "Exibir servidores na sala",
         "view_source_decrypted_event_source": "Fonte de evento descriptografada",
+        "view_source_decrypted_event_source_unavailable": "Fonte descriptografada indisponível",
         "widget_screenshots": "Ativar capturas de tela do widget em widgets suportados"
     },
     "dialog_close_label": "Fechar caixa de diálogo",
@@ -764,47 +911,37 @@
     "empty_room_was_name": "Sala vazia (era %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
+            "alternatives": "Se você tiver uma chave de segurança ou frase de segurança, isso também funcionará.",
             "key_validation_text": {
-                "invalid_security_key": "Chave de Segurança inválida",
-                "recovery_key_is_correct": "Muito bem!",
-                "wrong_file_type": "Tipo errado de arquivo",
-                "wrong_security_key": "Chave de Segurança errada"
+                "wrong_security_key": "A chave de recuperação que você inseriu não está correta."
             },
+            "privacy_warning": "Certifique-se de que ninguém possa ver essa tela!",
             "restoring": "Restaurando chaves do backup",
-            "security_key_title": "Chave de Segurança",
-            "security_phrase_incorrect_error": "Não foi possível acessar o armazenamento secreto. Verifique se você digitou a Frase de Segurança correta.",
-            "security_phrase_title": "Frase de segurança",
-            "use_security_key_prompt": "Use sua Chave de Segurança para continuar."
+            "security_key_title": "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_not_ready": "A autoverificação não está configurada.",
-        "cross_signing_ready": "A autoverificação está pronta para uso.",
-        "cross_signing_ready_no_backup": "A verificação está pronta mas as chaves não tem um backup configurado.",
         "cross_signing_room_normal": "Esta sala é criptografada de ponta a ponta",
         "cross_signing_room_verified": "Todos nesta sala estão confirmados",
         "cross_signing_room_warning": "Alguém está usando uma sessão desconhecida",
-        "cross_signing_unsupported": "Seu servidor não suporta a autoverificação.",
-        "cross_signing_untrusted": "Sua conta tem uma identidade autoverificada em armazenamento secreto, mas ainda não é considerada confiável por esta sessão.",
         "cross_signing_user_normal": "Você não confirmou este usuário.",
         "cross_signing_user_verified": "Você confirmou este usuário. Este usuário confirmou todas as próprias sessões.",
         "cross_signing_user_warning": "Este usuário não confirmou todas as próprias sessões.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Limpar chaves autoverificadas",
-            "title": "Destruir chaves autoverificadas?",
-            "warning": "Apagar chaves de autoverificação é permanente. Qualquer pessoa com quem você se confirmou receberá alertas de segurança. Não é aconselhável fazer isso, a menos que você tenha perdido todos os aparelhos nos quais fez a autoverificação."
-        },
+        "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_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.",
         "event_shield_reason_unverified_identity": "Criptografado por um usuário não verificado.",
         "export_unsupported": "O seu navegador não suporta as extensões de criptografia necessárias",
+        "forgot_recovery_key": "Esqueceu a chave de recuperação?",
         "import_invalid_keyfile": "Não é um arquivo de chave válido do %(brand)s",
         "import_invalid_passphrase": "Falha ao checar a autenticação: senha incorreta?",
+        "key_storage_out_of_sync": "Seu armazenamento de chaves está fora de sincronia.",
+        "key_storage_out_of_sync_description": "Confirme sua chave de recuperação para manter o acesso ao seu armazenamento de chaves e histórico de mensagens.",
         "messages_not_secure": {
             "cause_1": "Seu servidor local",
             "cause_2": "O servidor doméstico do usuário que você está verificando está conectado",
@@ -819,20 +956,27 @@
             "title": "Nova opção de recuperação",
             "warning": "Se você não definiu a nova opção de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina uma nova opção de recuperação imediatamente nas Configurações."
         },
-        "not_supported": "<não suportado>",
+        "pinned_identity_changed": "A identidade de %(displayName)s (<b>%(userId)s</b>) parece ter mudado. <a>Saiba mais</a>",
+        "pinned_identity_changed_no_displayname": "A identidade de <b>%(userId)s</b> parece ter mudado. <a>Saiba mais</a>",
         "recovery_method_removed": {
             "description_1": "Esta sessão detectou que a sua Frase de Segurança e a chave para mensagens seguras foram removidas.",
             "description_2": "Se você fez isso acidentalmente, você pode configurar Mensagens Seguras nesta sessão, o que vai re-criptografar o histórico de mensagens desta sessão com uma nova opção de recuperação.",
             "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.",
-            "title": "Configurar"
+            "explainer": "Faça o backup das suas chaves antes de sair, para evitar perdê-las."
         },
+        "turn_on_key_storage": "Ativar o armazenamento de chaves",
+        "turn_on_key_storage_description": "Armazene sua identidade criptográfica e as chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em qualquer novo dispositivo.",
         "udd": {
+            "interactive_verification_button": "Verificar interativamente por emoji",
             "other_ask_verify_text": "Peça a este usuário para confirmar a sessão dele, ou confirme-a manualmente abaixo.",
             "other_new_session_text": "%(name)s (%(userId)s) entrou em uma nova sessão sem confirmá-la:",
             "own_ask_verify_text": "Confirme suas outras sessões usando uma das opções abaixo.",
@@ -844,7 +988,6 @@
             "accepting": "Aceitando…",
             "after_new_login": {
                 "device_verified": "Dispositivo verificado",
-                "reset_confirmation": "Você realmente deseja redefinir as chaves de verificação?",
                 "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"
@@ -879,6 +1022,7 @@
             "qr_reciprocate_same_shield_device": "Quase lá! O seu outro dispositivo está mostrando o mesmo escudo?",
             "qr_reciprocate_same_shield_user": "Quase lá! Este escudo também aparece para %(displayName)s?",
             "request_toast_accept": "Verificar sessão",
+            "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",
@@ -907,11 +1051,13 @@
             "verification_description": "Verifique sua identidade para acessar mensagens criptografadas e provar sua identidade para outras pessoas.",
             "verification_dialog_title_device": "Verifique outro dispositivo",
             "verification_dialog_title_user": "Solicitação de confirmação",
+            "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_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_reset_warning_1": "A redefinição de suas chaves de verificação não pode ser desfeita. Após a redefinição, você não terá acesso às mensagens criptografadas antigas e todos os amigos que tenham verificado você anteriormente verão avisos de segurança até que você verifique novamente com eles.",
+            "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",
@@ -920,8 +1066,12 @@
             "waiting_other_device_details": "Esperando que você verifique em seu outro dispositivo, %(deviceName)s (%(deviceId)s)...",
             "waiting_other_user": "Aguardando %(displayName)s confirmar…"
         },
+        "verification_requested_toast_title": "Verificação solicitada",
+        "verified_identity_changed": "A identidade verificada de %(displayName)s (<b>%(userId)s</b>) foi alterada. <a>Saiba mais</a>",
+        "verified_identity_changed_no_displayname": "A identidade verificada de <b>%(userId)s</b> foi alterada. <a>Saiba mais</a>",
         "verify_toast_description": "Outras(os) usuárias(os) podem não confiar nela",
-        "verify_toast_title": "Confirmar esta sessão"
+        "verify_toast_title": "Confirmar esta sessão",
+        "withdraw_verification_action": "Retirar verificação"
     },
     "error": {
         "admin_contact": "Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando este serviço.",
@@ -930,9 +1080,11 @@
         "cannot_load_config": "Incapaz de carregar arquivo de configuração: por favor atualize a página para tentar de novo.",
         "connection": "Ocorreu um problema de comunicação com o servidor local. Tente novamente mais tarde.",
         "dialog_description_default": "Ocorreu um erro.",
+        "download_media": "Falha ao baixar a mídia de origem, nenhum URL de origem foi encontrado",
         "edit_history_unsupported": "O seu servidor local não parece suportar este recurso.",
         "failed_copy": "Não foi possível copiar",
         "hs_blocked": "Este servidor local foi bloqueado pelo seu administrador.",
+        "invalid_configuration_mixed_server": "Configuração inválida: um default_hs_url não pode ser especificado junto com default_server_name ou default_server_config",
         "invalid_configuration_no_server": "Configuração inválida: nenhum servidor default especificado.",
         "invalid_json": "Sua configuração do Element contém JSON inválido. Por favor corrija o problema e recarregue a página.",
         "invalid_json_detail": "A mensagem do parser é: %(message)s",
@@ -954,11 +1106,15 @@
         "storage_evicted_description_1": "Alguns dados de sessão, incluindo chaves de mensagens criptografadas, estão faltando. Desconecte-se e entre novamente para resolver isso, o que restaurará as chaves do backup.",
         "storage_evicted_description_2": "O seu navegador provavelmente removeu esses dados quando o espaço de armazenamento ficou insuficiente.",
         "storage_evicted_title": "Dados de sessão ausentes",
+        "sync": "Não foi possível conectar ao Homeserver. Tentando novamente…",
         "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_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.",
+    "error_app_open_in_another_tab_title": "%(brand)s está conectado em outra guia",
+    "error_app_opened_in_another_window": "%(brand)s está aberto em outra janela. Clique em \"%(label)s\" para usar %(brand)s aqui e desconectar a outra janela.",
     "error_database_closed_description": {
         "for_desktop": "Seu disco pode estar cheio. Por favor, libere algum espaço e recarregue.",
         "for_web": "Se você limpou os dados de navegação, esta mensagem é esperada. %(brand)s também pode estar aberto em outra guia ou seu disco está cheio. Por favor, libere algum espaço e recarregue"
@@ -970,11 +1126,7 @@
             "title": "Não foi possível copiar o link da sala"
         },
         "error_loading_user_profile": "Não foi possível carregar o perfil do usuário",
-        "forget_room_failed": "Falhou ao esquecer a sala %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
-            "title": "Busca falhou"
-        }
+        "forget_room_failed": "Falhou ao esquecer a sala %(errCode)s"
     },
     "error_user_not_logged_in": "O usuário não está logado",
     "event_preview": {
@@ -999,10 +1151,20 @@
             "you": "Você reagiu %(reaction)s a %(message)s"
         },
         "m.sticker": "%(senderName)s: %(stickerName)s",
-        "m.text": "%(senderName)s: %(message)s"
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "Áudio",
+            "file": "Arquivo",
+            "image": "Imagem",
+            "poll": "Enquete",
+            "video": "Vídeo"
+        },
+        "preview": "<bold>%(prefix)s: </bold> %(preview)s"
     },
     "export_chat": {
         "cancelled": "Exportação cancelada",
+        "cancelled_detail": "A exportação foi cancelada com sucesso",
+        "confirm_stop": "Tem certeza de que deseja parar de exportar seus dados? Se o fizer, terá de começar de novo.",
         "creating_html": "Criando HTML...",
         "creating_output": "Criando saída...",
         "creator_summary": "%(creatorName)s criou esta sala.",
@@ -1015,6 +1177,7 @@
             "one": "%(count)s evento exportado em %(seconds)s segundos",
             "other": "%(count)s eventos exportados em %(seconds)s segundos"
         },
+        "exporting_your_data": "Exportando seus dados",
         "fetched_n_events": {
             "one": "Buscado %(count)s evento até agora",
             "other": "Buscado %(count)s eventos até agora"
@@ -1029,6 +1192,7 @@
         },
         "fetching_events": "Buscando eventos...",
         "file_attached": "Arquivo Anexado",
+        "format": "Formato",
         "from_the_beginning": "Do começo",
         "generating_zip": "Gerando um ZIP",
         "html": "HTML",
@@ -1043,11 +1207,15 @@
         "num_messages_min_max": "Número de mensagens pode ser apenas um número entre %(min)s e %(max)s",
         "number_of_messages": "Especifique um número de mensagens",
         "previous_page": "Grupo anterior de mensagens",
+        "processing": "Processando...",
         "processing_event_n": "Processando evento %(number)s de %(total)s",
         "select_option": "Selecione uma das opções abaixo para exportar bate-papos da sua linha do tempo",
         "size_limit": "Limite de Tamanho",
         "size_limit_min_max": "O tamanho pode ser apenas um número entre %(min)s MB e %(max)s MB",
+        "size_limit_postfix": "MB",
         "starting_export": "Iniciando exportação…",
+        "successful": "Exportação bem-sucedida",
+        "successful_detail": "Sua exportação foi bem-sucedida. Encontre na sua pasta de Downloads.",
         "text": "Texto Simples",
         "title": "Exportar bate-papo",
         "topic": "Tópico: %(topic)s",
@@ -1058,7 +1226,9 @@
         "can_contact_label": "Vocês podem me contactar se tiverem quaisquer perguntas subsequentes",
         "comment_label": "Comentário",
         "existing_issue_link": "Por favor, consulte os <existingIssuesLink> erros conhecidos no Github </existingIssuesLink> antes de enviar o seu. Se ninguém tiver mencionado o seu erro, <newIssueLink> informe-nos sobre um erro novo </newIssueLink>.",
-        "pro_type": "DICA: se você nos informar um erro, envie <debugLogsLink> relatórios de erro </debugLogsLink> para nos ajudar a rastrear o problema.",
+        "may_contact_label": "Você pode entrar em contato comigo se quiser acompanhar ou me deixar testar as próximas ideias",
+        "platform_username": "Sua plataforma e nome de usuário serão registrados para nos ajudar a usar seu feedback o máximo possível.",
+        "pro_type": "DICA: se você nos informar um erro, envie <debugLogsLink> relatórios de erro</debugLogsLink> para nos ajudar a rastrear o problema.",
         "send_feedback_action": "Enviar comentário",
         "sent": "Comentário enviado"
     },
@@ -1070,7 +1240,9 @@
     },
     "forward": {
         "filter_placeholder": "Procurar por salas ou pessoas",
+        "message_preview_heading": "Pré-visualização da mensagem",
         "no_perms_title": "Você não tem permissão para fazer isso",
+        "open_room": "Sala aberta",
         "send_label": "Enviar",
         "sending": "Enviando",
         "sent": "Enviado"
@@ -1079,6 +1251,7 @@
         "change": "Alterar o servidor de identidade",
         "change_prompt": "Desconectar-se do servidor de identidade <current /> e conectar-se em <new /> em vez disso?",
         "change_server_prompt": "Se você não quiser usar <server /> para descobrir e ser detectável pelos contatos existentes, digite outro servidor de identidade abaixo.",
+        "changed": "Seu servidor de identidade foi alterado",
         "checking": "Verificando servidor",
         "description_connected": "No momento, você está usando <server></server> para descobrir e ser descoberto pelos contatos existentes que você conhece. Você pode alterar seu servidor de identidade abaixo.",
         "description_disconnected": "No momento, você não está usando um servidor de identidade. Para descobrir e ser descoberto pelos contatos existentes, adicione um abaixo.",
@@ -1110,18 +1283,34 @@
         "other": "Em %(spaceName)s e %(count)s outros espaços."
     },
     "incompatible_browser": {
-        "title": "Browser insuportado"
+        "continue": "Continuar mesmo assim",
+        "description": "%(brand)s usa alguns recursos do navegador que não estão disponíveis no seu navegador atual. %(detail)s",
+        "detail_can_continue": "Se você continuar, alguns recursos podem parar de funcionar e há o risco de você perder dados no futuro.",
+        "detail_no_continue": "Tente atualizar este navegador se não estiver usando a versão mais recente e tente novamente.",
+        "learn_more": "Saber mais",
+        "linux": "Linux",
+        "macos": "Mac",
+        "supported_browsers": "",
+        "title": "Browser insuportado",
+        "use_desktop_heading": "Use %(brand)s Desktop em vez disso",
+        "use_mobile_heading": "Em vez disso %(brand)s, use no celular",
+        "use_mobile_heading_after_desktop": "Ou use nosso aplicativo móvel",
+        "windows_64bit": "Windows (64 bits)",
+        "windows_arm_64bit": "Windows (ARM 64 bits)"
     },
     "info_tooltip_title": "Informação",
     "integration_manager": {
+        "connecting": "Conectando-se ao gerenciador de integração...",
         "error_connecting": "Ou o gerenciador de integrações está indisponível, ou ele não conseguiu acessar o seu servidor.",
         "error_connecting_heading": "Não foi possível conectar ao gerenciador de integrações",
         "explainer": "O gerenciador de integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.",
         "manage_title": "Gerenciar integrações",
+        "toggle_label": "Habilitar o gerenciador de integração",
         "use_im": "Use o gerenciador de integrações para gerenciar bots, widgets e pacotes de figurinhas.",
         "use_im_default": "Use o gerenciador de integrações em <b>(%(serverName)s)</b> para gerenciar bots, widgets e pacotes de figurinhas."
     },
     "integrations": {
+        "disabled_dialog_description": "Habilite '%(manageIntegrations)s' em Configurações para fazer isto.",
         "disabled_dialog_title": "As integrações estão desativadas",
         "impossible_dialog_description": "Seu %(brand)s não permite que você use o gerenciador de integrações para fazer isso. Entre em contato com o administrador.",
         "impossible_dialog_title": "As integrações não estão permitidas"
@@ -1148,9 +1337,11 @@
         "error_permissions_space": "Você não tem permissão para convidar pessoas para este espaço.",
         "error_profile_undisclosed": "O usuário pode ou não existir",
         "error_transfer_multiple_target": "Uma chamada só pode ser transferida para um único usuário.",
+        "error_unfederated_room": "Esta sala não é federada. Você não pode convidar pessoas de servidores externos.",
+        "error_unfederated_space": "Esse espaço não é federado. Você não pode convidar pessoas de servidores externos.",
         "error_unknown": "Erro de servidor desconhecido",
         "error_user_not_found": "O usuário não existe",
-        "error_version_unsupported_room": "O servidor desta(e) usuária(o) não suporta a versão desta sala.",
+        "error_version_unsupported_room": "O servidor doméstico do usuário não é compatível com a versão da sala.",
         "error_version_unsupported_space": "O servidor doméstico do usuário não é compatível com a versão do espaço.",
         "failed_generic": "A operação falhou",
         "failed_title": "Falha ao enviar o convite",
@@ -1192,6 +1383,9 @@
         "activate_button": "Apertar no botão selecionado",
         "alt": "Alt",
         "autocomplete_cancel": "Cancelar o preenchimento automático",
+        "autocomplete_force": "Forçar conclusão",
+        "autocomplete_navigate_next": "Próxima sugestão de preenchimento automático",
+        "autocomplete_navigate_prev": "Sugestão anterior de preenchimento automático",
         "backspace": "Backspace",
         "cancel_reply": "Cancelar resposta à mensagem",
         "category_autocomplete": "Preencher automaticamente",
@@ -1199,13 +1393,17 @@
         "category_navigation": "Navegação",
         "category_room_list": "Lista de salas",
         "close_dialog_menu": "Fechar caixa de diálogo ou menu",
+        "composer_jump_end": "Ir para o final do compositor",
+        "composer_jump_start": "Ir para o início do compositor",
         "composer_navigate_next_history": "Navegue para a próxima mensagem no histórico do compositor",
         "composer_navigate_prev_history": "Navegue até a mensagem anterior no histórico do compositor",
         "composer_new_line": "Nova linha",
         "composer_redo": "Refazer edição",
         "composer_toggle_bold": "Negrito",
+        "composer_toggle_code_block": "Alternar para bloco de código",
         "composer_toggle_italics": "Itálico",
-        "composer_toggle_quote": "Citar",
+        "composer_toggle_link": "Alternar para link",
+        "composer_toggle_quote": "Alternar para citação",
         "composer_undo": "Desfazer edição",
         "control": "Ctrl",
         "dismiss_read_marker_and_jump_bottom": "Ignorar o marcador de leitura e ir para o final",
@@ -1218,43 +1416,74 @@
         "jump_last_message": "Ir para a última mensagem",
         "jump_room_search": "Ir para a pesquisa de salas",
         "jump_to_read_marker": "Ir para a mensagem não lida mais antiga",
+        "keyboard_shortcuts_tab": "Abra esta guia de configurações",
         "navigate_next_history": "Próxima sala ou espaço visitado recentemente",
+        "navigate_next_message_edit": "Navegar até a próxima mensagem para editar",
         "navigate_prev_history": "Sala ou espaço visitado recentemente",
+        "navigate_prev_message_edit": "Navegar até a mensagem anterior para editar",
+        "next_landmark": "Ir para o próximo ponto de referência",
+        "next_room": "Próxima sala ou mensagem privada",
+        "next_unread_room": "Próxima sala não lida ou mensagem direta",
         "number": "[número]",
         "open_user_settings": "Abrir as configurações do usuário",
         "page_down": "Página para baixo",
         "page_up": "Página para cima",
+        "prev_landmark": "Ir para o ponto de referência anterior",
+        "prev_room": "Sala anterior ou mensagem privada",
+        "prev_unread_room": "Sala anterior não lida ou mensagem privada",
         "room_list_collapse_section": "Esconder seção da lista de salas",
         "room_list_expand_section": "Mostrar seção da lista de salas",
+        "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",
+        "scroll_down_timeline": "Rola para baixo no histórico",
+        "scroll_up_timeline": "Rola para cima no histórico",
         "search": "Pesquisar (deve estar ativado)",
         "send_sticker": "Enviar uma figurinha",
         "shift": "Shift",
         "space": "Barra de espaço",
         "switch_to_space": "Mudar para o espaço por número",
+        "toggle_hidden_events": "Ativar a visibilidade de eventos ocultos",
         "toggle_microphone_mute": "Ativar/desativar som do microfone",
         "toggle_right_panel": "Alternar o painel na direita",
+        "toggle_space_panel": "Alternar para painel de espaço",
         "toggle_top_left_menu": "Alternar o menu superior esquerdo",
+        "toggle_webcam_mute": "Ligar/desligar a webcam",
         "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",
+        "automatic_debug_logs_key_backup": "Envie automaticamente logs quando o backup da chave não estiver funcionando",
+        "beta_description": "O que vem por aí no %(brand)s? Os laboratórios são a melhor maneira de obter informações antecipadas, testar novos recursos e ajudar a moldá-los antes do lançamento.",
         "beta_feature": "Este é um recurso beta",
         "beta_feedback_leave_button": "Para sair do beta, vá nas suas configurações.",
+        "beta_feedback_title": "Comentários beta para %(featureName)s",
+        "beta_section": "Próximos recursos",
         "bridge_state": "Exibir informações sobre integrações nas configurações das salas",
         "bridge_state_channel": "Canal: <channelLink/>",
         "bridge_state_creator": "Esta integração foi disponibilizada por <user />.",
         "bridge_state_manager": "Esta integração é desenvolvida por <user />.",
         "bridge_state_workspace": "Espaço de trabalho: <networkLink/>",
+        "click_for_info": "Clique para mais informações",
         "currently_experimental": "Atualmente experimental.",
         "custom_themes": "Permite adicionar temas personalizados",
         "dynamic_room_predecessors": "Predecessores de salas dinâmicas",
+        "dynamic_room_predecessors_description": "Habilitar MSC3946 (para dar suporte a arquivos de chat para quem chegar mais tarde)",
+        "element_call_video_rooms": "Salas de vídeo Element Call",
+        "exclude_insecure_devices": "Excluir dispositivos inseguros ao enviar/receber mensagens",
+        "exclude_insecure_devices_description": "Quando esse modo estiver ativado, as mensagens criptografadas não serão compartilhadas com dispositivos não verificados e as mensagens de dispositivos não verificados serão mostradas como um erro. Observe que, se você ativar esse modo, talvez não consiga se comunicar com usuários que não verificaram seus dispositivos.",
+        "experimental_description": "Está se sentindo experimental? Experimente nossas últimas ideias em desenvolvimento. Esses recursos não estão finalizados; eles podem ser instáveis, podem mudar ou podem ser descartados completamente.<a> Saiba mais</a> .",
+        "experimental_section": "Pré-visualizações antecipadas",
+        "extended_profiles_msc_support": "Requer que seu servidor ofereça suporte ao MSC4133",
+        "feature_disable_call_per_sender_encryption": "Desativar a criptografia por remetente para Element Call",
         "feature_wysiwyg_composer_description": "Use rich text em vez de Markdown no compositor de mensagens.",
         "group_calls": "Nova experiência de chamada em grupo",
         "group_developer": "Desenvolvedor",
         "group_encryption": "Criptografia",
+        "group_experimental": "Experimental",
         "group_messaging": "Mensagens",
         "group_moderation": "Moderação",
         "group_profile": "Perfil",
@@ -1262,30 +1491,47 @@
         "group_spaces": "Espaços",
         "group_themes": "Temas",
         "group_threads": "Tópicos",
+        "group_ui": "Interface do usuário",
         "group_voip": "Voz e vídeo",
+        "group_widgets": "Widgets",
         "hidebold": "Ocultar ponto de notificação (exibir somente emblemas de contadores)",
         "html_topic": "Mostrar representação HTML dos tópicos da sala",
         "join_beta": "Participe da versão beta",
+        "join_beta_reload": "Aderir à versão beta irá recarregar %(brand)s.",
         "jump_to_date": "Ir para a data (adiciona cabeçalhos /jumptodate e pular para a data)",
         "jump_to_date_msc_support": "Requer que seu servidor suporte MSC3030",
         "latex_maths": "Renderizar fórmulas matemáticas LaTeX em mensagens",
+        "leave_beta": "Sair da versão beta",
+        "leave_beta_reload": "Sair da versão beta irá recarregar %(brand)s.",
         "location_share_live": "Compartilhamento de localização ao vivo",
         "location_share_live_description": "Implementação temporária. As localizações persistem no histórico da sala.",
         "mjolnir": "Novas formas de ignorar as pessoas",
         "msc3531_hide_messages_pending_moderation": "Permitir que os moderadores ocultem mensagens com moderação pendente.",
+        "new_room_list": "Habilitar nova lista de salas",
         "notification_settings": "Novas configurações de notificação",
+        "notification_settings_beta_caption": "Apresentamos uma maneira mais simples de alterar suas configurações de notificação. Personalize o seu %(brand)s, da forma que quiser.",
+        "notification_settings_beta_title": "Configurações de notificação",
+        "notifications": "Ative o painel de notificações no cabeçalho da sala",
+        "release_announcement": "Anúncio de lançamento",
+        "render_reaction_images": "Renderizar imagens personalizadas em reações",
+        "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.",
         "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",
         "sliding_sync_server_no_support": "Seu servidor não tem suporte",
         "under_active_development": "Em desenvolvimento ativo.",
+        "unrealiable_e2e": "Não confiável em salas criptografadas",
         "video_rooms": "Salas de vídeo",
         "video_rooms_a_new_way_to_chat": "Uma nova maneira de conversar por voz e vídeo em %(brand)s .",
         "video_rooms_always_on_voip_channels": "As salas de vídeo são canais VoIP sempre ativos incorporados em uma sala em %(brand)s .",
+        "video_rooms_beta": "As salas de vídeo são um recurso beta",
         "video_rooms_faq1_answer": "Use o botão “+” na seção da sala do painel esquerdo.",
         "video_rooms_faq1_question": "Como posso criar uma sala de vídeo?",
         "video_rooms_faq2_answer": "Sim, a linha do tempo do chat é exibida ao lado do vídeo.",
         "video_rooms_faq2_question": "Posso usar o chat de texto junto com a videochamada?",
+        "video_rooms_feedbackSubheading": "Obrigado por experimentar a versão beta. Forneça o máximo de detalhes que você puder para que possamos aprimorá-la.",
         "wysiwyg_composer": "Editor de texto rico"
     },
     "labs_mjolnir": {
@@ -1305,6 +1551,7 @@
         "lists_heading": "Listas inscritas",
         "lists_new_label": "ID da sala ou endereço da lista de banidos",
         "no_lists": "Você não está inscrito em nenhuma lista",
+        "personal_description": "Sua lista pessoal de banimento contém todos os usuários/servidores dos quais você pessoalmente não deseja receber mensagens. Depois de ignorar o primeiro usuário/servidor, uma nova sala aparecerá na sua lista de salas chamada '%(myBanList)s' - permaneça nessa sala para manter a lista de banimento em vigor.",
         "personal_empty": "Você não bloqueou ninguém.",
         "personal_heading": "Lista pessoal de banidos",
         "personal_new_label": "Servidor ou ID de usuário para bloquear",
@@ -1322,9 +1569,12 @@
     },
     "language_dropdown_label": "Menu suspenso de idiomas",
     "leave_room_dialog": {
+        "last_person_warning": "Você é a única pessoa aqui. Se você sair, ninguém poderá se juntar no futuro, inclusive você.",
         "leave_room_question": "Tem certeza de que deseja sair da sala '%(roomName)s'?",
         "leave_space_question": "Tem certeza de que deseja sair desse espaço '%(spaceName)s'?",
-        "room_rejoin_warning": "Esta sala não é pública. Você não poderá voltar sem ser convidada/o.",
+        "room_leave_admin_warning": "Você é o único administrador nesta sala. Se você sair, ninguém poderá alterar as configurações da sala ou realizar outras ações importantes.",
+        "room_leave_mod_warning": "Você é o único moderador nesta sala. Se você sair, ninguém poderá alterar as configurações da sala ou realizar outras ações importantes.",
+        "room_rejoin_warning": "Esta sala não é pública. Você não poderá entrar novamente sem um convite.",
         "space_rejoin_warning": "Este espaço não é público. Você não poderá entrar novamente sem um convite."
     },
     "left_panel": {
@@ -1332,34 +1582,87 @@
     },
     "lightbox": {
         "rotate_left": "Girar para a esquerda",
-        "rotate_right": "Girar para a direita"
+        "rotate_right": "Girar para a direita",
+        "title": "Visualização da imagem"
     },
     "location_sharing": {
+        "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_move_pin": "Clique​•​para​•​mover​•​o​•​alfinete",
+        "close_sidebar": "Fechar​•​barra​•​lateral",
+        "error_fetch_location": "Não​•​foi​•​possível​•​obter​•​a​•​localização",
+        "error_no_perms_description": "Você​•​precisa​•​ter​•​as​•​permissões​•​corretas​•​para​•​compartilhar​•​locais​•​nesta​•​sala.",
+        "error_no_perms_title": "Você​•​não​•​tem​•​permissão​•​para​•​compartilhar​•​locais",
+        "error_send_description": "%(brand)s​•​não​•​pôde​•​enviar​•​a​•​sua​•​localização.​•​Tente​•​novamente​•​mais​•​tarde.",
         "error_send_title": "Não foi possível enviar sua localização",
+        "error_sharing_live_location": "Ocorreu​•​um​•​erro​•​ao​•​compartilhar​•​sua​•​localização​•​ao​•​vivo",
+        "error_stopping_live_location": "Ocorreu​•​um​•​erro​•​ao​•​interromper​•​sua​•​localização​•​ao​•​vivo",
+        "expand_map": "Expandir​•​mapa",
+        "failed_generic": "Falha​•​ao​•​buscar​•​sua​•​localização.​•​Tente​•​novamente​•​mais​•​tarde.",
+        "failed_load_map": "Não​•​é​•​possível​•​carregar​•​o​•​mapa",
+        "failed_permission": "%(brand)s teve​•​sua​•​permissão​•​negada​•​para​•​buscar​•​sua​•​localização.​•​Permita​•​o​•​acesso​•​à​•​localização​•​nas​•​configurações​•​do​•​seu​•​navegador.",
+        "failed_timeout": "Tempo​•​limite​•​esgotado​•​ao​•​tentar​•​buscar​•​sua​•​localização.​•​Tente​•​novamente​•​mais​•​tarde.",
+        "failed_unknown": "Erro​•​desconhecido​•​ao​•​buscar​•​local.​•​Tente​•​novamente​•​mais​•​tarde.",
         "find_my_location": "Encontrar minha localização",
+        "live_description": "Localização​•​ao​•​vivo​•​de​•​%(displayName)s",
         "live_enable_description": "Observação: este é um recurso de laboratório que usa uma implementação temporária. Isso significa que você não poderá excluir seu histórico de localização, e usuários avançados poderão ver seu histórico de localização mesmo depois que você parar de compartilhar sua localização ao vivo com esta sala.",
+        "live_enable_heading": "Compartilhamento​•​de​•​localização​•​ao​•​vivo",
+        "live_location_active": "Você está compartilhando sua localização ao vivo",
+        "live_location_enabled": "Localização ao vivo ativada",
+        "live_location_ended": "Localização​•​ao​•​vivo​•​encerrada",
+        "live_location_error": "Erro​•​de​•​localização​•​ao​•​vivo",
+        "live_locations_empty": "Sem​•​locais​•​ao​•​vivo",
+        "live_share_button": "Compartilhe​•​por​•​%(duration)s",
+        "live_toggle_label": "Ativar​•​o​•​compartilhamento​•​de​•​localização​•​ao​•​vivo",
+        "live_until": "Ao​•​vivo​•​até​•​%(expiryTime)s",
+        "live_update_time": "Atualizado​•​%(humanizedUpdateTime)s",
+        "loading_live_location": "Carregando​•​local​•​ao​•​vivo...",
         "location_not_available": "Local não disponível",
-        "share_button": "Compartilhar localização"
+        "map_feedback": "Feedback​•​do​•​mapa",
+        "mapbox_logo": "Logotipo​•​da​•​Mapbox",
+        "reset_bearing": "Redefinir​•​o​•​rumo​•​para​•​o​•​norte",
+        "share_button": "Compartilhar localização",
+        "share_type_live": "Minha​•​localização​•​ao​•​vivo",
+        "share_type_own": "Minha​•​localização​•​atual",
+        "share_type_pin": "Solte​•​um​•​alfinete",
+        "share_type_prompt": "Que​•​tipo​•​de​•​localização​•​você​•​deseja​•​compartilhar?",
+        "toggle_attribution": "Alternar​•​atribuição"
     },
     "member_list": {
+        "count": {
+            "one": "%(count)s membro",
+            "other": "%(count)s membros"
+        },
         "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)"
     },
     "member_list_back_action_label": "Membros da sala",
     "message_edit_dialog_title": "Edições na mensagem",
+    "migrating_crypto": "Aguente firme. Estamos atualizando %(brand)s para tornar a criptografia mais rápida e confiável.",
     "mobile_guide": {
         "toast_accept": "Usar o aplicativo",
+        "toast_description": "%(brand)s é experimental em um navegador da Web móvel. Para uma melhor experiência e os recursos mais recentes, use nosso aplicativo nativo gratuito.",
         "toast_title": "Use o aplicativo para ter uma experiência melhor"
     },
+    "name_and_id": "%(name)s (%(userId)s)",
     "no_more_results": "Não há mais resultados",
     "notif_panel": {
-        "empty_description": "Não há notificações."
+        "empty_description": "Não há notificações.",
+        "empty_heading": "Isso é tudo, pessoal!"
     },
     "notifications": {
         "all_messages": "Todas as mensagens novas",
         "all_messages_description": "Seja notificado para cada mensagem",
+        "class_global": "Global",
         "class_other": "Outros",
         "default": "Padrão",
+        "default_settings": "Corresponder às configurações padrão",
+        "email_pusher_app_display_name": "Notificações por e-mail",
         "enable_prompt_toast_description": "Ativar notificações na área de trabalho",
         "enable_prompt_toast_title": "Notificações",
         "enable_prompt_toast_title_from_message_send": "Não perca uma resposta",
@@ -1367,13 +1670,18 @@
         "keyword": "Palavra-chave",
         "keyword_new": "Nova palavra-chave",
         "level_activity": "Atividade recente",
+        "level_highlight": "Destaque",
+        "level_muted": "Silenciado",
         "level_none": "Nenhuma",
+        "level_notification": "Notificação",
+        "level_unsent": "Não enviado",
         "mark_all_read": "Marcar tudo como lido",
         "mentions_and_keywords": "@menções e palavras-chave",
         "mentions_and_keywords_description": "Receba notificações apenas com menções e palavras-chave conforme definido em suas <a>configurações</a>",
-        "mentions_keywords": "Menções e palavras-chave",
+        "mentions_keywords": "Menções e palavras-chave!",
         "message_didnt_send": "A mensagem não foi enviada. Clique para mais informações.",
-        "mute_description": "Você não receberá nenhuma notificação"
+        "mute_description": "Você não receberá nenhuma notificação",
+        "mute_room": "Silenciar sala"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s está solicitando confirmação"
@@ -1382,23 +1690,41 @@
         "create_room": "Criar um chat de grupo",
         "explore_rooms": "Explorar salas públicas",
         "has_avatar_label": "Ótimo, agora as pessoas identificarão você",
+        "intro_byline": "Seja dono de suas conversas.",
         "intro_welcome": "Boas-vindas ao %(appName)s",
         "no_avatar_label": "Adicione uma foto para as pessoas identificarem você.",
         "send_dm": "Enviar uma mensagem",
         "welcome_detail": "Agora, vamos começar",
         "welcome_user": "Boas-vindas, %(name)s"
     },
+    "pill": {
+        "permalink_other_room": "Mensagem em %(room)s",
+        "permalink_this_room": "Mensagem de %(user)s"
+    },
     "poll": {
+        "create_poll_action": "Criar Enquete",
         "create_poll_title": "Criar enquete",
+        "disclosed_notes": "Os participantes veem os resultados assim que votam",
+        "edit_poll_title": "Editar enquete",
+        "end_description": "Tem certeza de que deseja encerrar esta enquete? Isso mostrará os resultados finais da enquete e impedirá que as pessoas possam votar.",
         "end_message": "A enquete terminou. Resposta principal: %(topAnswer)s",
         "end_message_no_votes": "A enquete terminou. Nenhum voto foi dado.",
+        "end_title": "Encerrar Enquete",
+        "error_ending_description": "Desculpe, a enquete não terminou. Por favor, tente novamente.",
+        "error_ending_title": "Falha ao finalizar a enquete",
         "error_voting_description": "Desculpe, seu voto não foi registrado. Por favor, tente novamente.",
         "error_voting_title": "Voto não registrado",
         "failed_send_poll_description": "Desculpe, a enquete que você tentou criar não foi publicada.",
         "failed_send_poll_title": "Falha ao postar enquete",
+        "notes": "Os resultados só são revelados quando você encerra a enquete",
+        "options_add_button": "Adicionar opção",
+        "options_heading": "Criar opções",
+        "options_label": "Opção %(number)s",
+        "options_placeholder": "Escrever uma opção",
         "topic_heading": "Qual é a pergunta ou o tópico da sua enquete?",
         "topic_label": "Pergunta ou tópico",
         "topic_placeholder": "Escreva algo…",
+        "total_decryption_errors": "Devido a erros de descriptografia, alguns votos podem não ser contados",
         "total_n_votes": {
             "one": "%(count)s votos expressos. Vote para ver os resultados",
             "other": "%(count)s votos expressos. Vote para ver os resultados"
@@ -1407,7 +1733,13 @@
             "one": "Com base na votação de %(count)s",
             "other": "Com base em %(count)s votos"
         },
-        "total_no_votes": "Sem votos expressos"
+        "total_no_votes": "Sem votos expressos",
+        "total_not_ended": "Os resultados ficarão visíveis quando a enquete terminar",
+        "type_closed": "Enquete encerrada",
+        "type_heading": "Tipo de enquete",
+        "type_open": "Enquete aberta",
+        "unable_edit_description": "Desculpe, você não pode editar uma enquete após os votos terem sido registrados.",
+        "unable_edit_title": "Não é possível editar a enquete"
     },
     "power_level": {
         "admin": "Administrador/a",
@@ -1418,6 +1750,7 @@
         "moderator": "Moderador/a",
         "restricted": "Restrito"
     },
+    "powered_by_matrix": "Desenvolvido por Matrix",
     "powered_by_matrix_with_logo": "Chat descentralizado e encriptado & colaboração, powered by $matrixLogo",
     "presence": {
         "away": "Ausente",
@@ -1426,10 +1759,11 @@
         "idle_for": "Inativo há %(duration)s",
         "offline": "Offline",
         "offline_for": "Offline há %(duration)s",
-        "online": "Conectada/o",
+        "online": "Disponível",
         "online_for": "Online há %(duration)s",
         "unknown": "Desconhecido",
-        "unknown_for": "Status desconhecido há %(duration)s"
+        "unknown_for": "Status desconhecido há %(duration)s",
+        "unreachable": "Servidor do usuário inacessível"
     },
     "quick_settings": {
         "all_settings": "Todas as configurações",
@@ -1443,57 +1777,103 @@
     },
     "redact": {
         "confirm_button": "Confirmar a remoção",
+        "confirm_description": "Tem certeza de que deseja remover (excluir) este evento?",
+        "confirm_description_state": "Observe que remover alterações na sala desta forma pode desfazer a alteração.",
         "error": "Você não pode apagar esta mensagem. (%(code)s)",
         "ongoing": "Removendo…",
         "reason_label": "Motivo (opcional)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Tem certeza de que deseja recusar o convite?",
-        "failed": "Falha ao tentar recusar o convite",
-        "title": "Recusar o convite"
-    },
     "report_content": {
-        "description": "Reportar esta mensagem enviará o seu 'event ID' único para o/a administrador/a do seu Homeserver. Se as mensagens nesta sala são criptografadas, o/a administrador/a não conseguirá ler o texto da mensagem nem ver nenhuma imagem ou arquivo.",
+        "description": "Denunciar essa mensagem enviará seu “ID de evento” exclusivo ao administrador do seu servidor doméstico. Se as mensagens nesta sala forem criptografadas, o administrador do servidor doméstico não poderá ler o texto da mensagem nem visualizar arquivos ou imagens.",
+        "disagree": "Discordo",
+        "error_create_room_moderation_bot": "Não é possível criar espaço com o bot de moderação",
+        "hide_messages_from_user": "Marque se você deseja ocultar todas as mensagens atuais e futuras desse usuário.",
+        "ignore_user": "Ignorar usuário",
+        "illegal_content": "Conteúdo ilegal",
         "missing_reason": "Por favor, descreva porque você está reportando.",
+        "nature": "Escolha uma natureza e descreva o que torna essa mensagem abusiva.",
+        "nature_disagreement": "O que esse usuário está escrevendo está errado.\nIsso será relatado aos moderadores da sala.",
+        "nature_illegal": "Este usuário está exibindo comportamento ilegal, por exemplo, expondo pessoas (doxxing) ou ameaçando de violência.\nIsso será relatado aos moderadores da sala, que podem encaminhar isso às autoridades legais.",
+        "nature_nonstandard_admin": "Esta sala é dedicada a conteúdo ilegal ou tóxico ou os moderadores não conseguem moderar conteúdo ilegal ou tóxico.\nIsso será relatado aos administradores do %(homeserver)s.",
+        "nature_nonstandard_admin_encrypted": "Esta sala é dedicada a conteúdo ilegal ou tóxico ou os moderadores não conseguem moderar conteúdo ilegal ou tóxico.\nIsso será relatado aos administradores do %(homeserver)s. Os administradores NÃO poderão ler o conteúdo criptografado desta sala.",
+        "nature_other": "Qualquer outro motivo. Descreva o problema.\nIsso será relatado aos moderadores da sala.",
+        "nature_spam": "Esse usuário está enviando spam para a sala com anúncios, links para anúncios ou propaganda.\nIsso será relatado aos moderadores da sala.",
+        "nature_toxic": "Esse usuário está exibindo comportamento tóxico, por exemplo, insultando outros usuários ou compartilhando conteúdo somente para adultos em um sala para menores de idade ou violando as regras desta sala. Isso será relatado aos moderadores da sala.",
         "other_label": "Outros",
-        "report_content_to_homeserver": "Denunciar conteúdo ao administrador do seu servidor principal"
+        "report_content_to_homeserver": "Denunciar conteúdo ao administrador do seu servidor principal",
+        "report_entire_room": "Denunciar a sala inteira",
+        "spam_or_propaganda": "Spam ou propaganda",
+        "toxic_behaviour": "Comportamento tóxico"
+    },
+    "report_room": {
+        "description": "Denuncie esta sala ao administrador do seu servidor. Isso enviará a ID exclusiva da sala, mas se as mensagens forem criptografadas, o administrador não poderá lê-las nem visualizar os arquivos compartilhados.",
+        "reason_label": "Descreva o motivo"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Falha ao descriptografar as sessões de %(failedCount)s!",
         "count_of_successfully_restored_keys": "%(sessionCount)s chaves foram restauradas com sucesso",
-        "enter_key_description": "Acesse o seu histórico de mensagens seguras e configure as mensagens seguras, ao inserir a sua Chave de Segurança.",
-        "enter_key_title": "Digite a Chave de Segurança",
+        "enter_key_description": "Acesse o seu histórico de mensagens seguras e configure as mensagens seguras, ao inserir a sua Chave de Recuperação.",
+        "enter_key_title": "Digite a Chave de Recuperação",
         "enter_phrase_description": "Acesse o seu histórico de mensagens seguras e configure mensagens seguras digitando a sua Frase de Segurança.",
         "enter_phrase_title": "Digite a Frase de Segurança",
         "incorrect_security_phrase_dialog": "O backup não pôde ser descriptografado com esta Frase de Segurança: verifique se você digitou a Frase de Segurança correta.",
         "incorrect_security_phrase_title": "Frase de Segurança incorreta",
         "key_backup_warning": "<b>Atenção</b>: você só deve configurar o backup de chave em um computador de sua confiança.",
-        "key_forgotten_text": "Se você esqueceu a sua Chave de Segurança, você pode <button>definir novas opções de recuperação</button>",
-        "key_is_invalid": "Chave de Segurança inválida",
-        "key_is_valid": "Essa Chave de Segurança é válida!",
+        "key_fetch_in_progress": "Obtendo chaves do servidor…",
+        "key_forgotten_text": "Se você esqueceu a sua Chave de Recuperação, você pode <button>definir novas opções de recuperação</button>",
+        "key_is_invalid": "Chave de Recuperação inválida",
+        "key_is_valid": "Essa Chave de Recuperação é válida!",
         "keys_restored_title": "Chaves restauradas",
         "load_error_content": "Não foi possível carregar o status do backup",
         "load_keys_progress": "%(completed)s de %(total)s chaves restauradas",
         "no_backup_error": "Nenhum backup encontrado!",
-        "phrase_forgotten_text": "Se você esqueceu a sua Frase de Segurança, você pode <button1>usar a sua Chave de Segurança</button1> ou <button2>definir novas opções de recuperação</button2>",
-        "recovery_key_mismatch_description": "Não foi possível descriptografar o backup com esta chave de segurança: verifique se você digitou a chave de segurança correta.",
-        "recovery_key_mismatch_title": "Incompatibilidade da Chave de Segurança",
+        "phrase_forgotten_text": "Se você esqueceu a sua Frase de Segurança, você pode <button1>usar a sua Chave de Recuperação</button1> ou <button2>definir novas opções de recuperação</button2>",
+        "recovery_key_mismatch_description": "O backup não pôde ser descriptografado com essa chave de recuperação: verifique se você inseriu a chave de recuperação correta.",
+        "recovery_key_mismatch_title": "Incompatibilidade da chave de recuperação",
         "restore_failed_error": "Não foi possível restaurar o backup"
     },
     "right_panel": {
         "add_integrations": "Adicionar extensões",
         "add_topic": "Adicionar tópico",
+        "extensions_button": "Extensões",
+        "extensions_empty_description": "Selecione “%(addIntegrations)s” para navegar e adicionar extensões a esta sala",
+        "extensions_empty_title": "Aumente a produtividade com mais ferramentas, widgets e bots",
         "files_button": "Arquivos",
         "pinned_messages": {
+            "empty_description": "Selecione uma mensagem e escolha “%(pinAction)s” para incluí-la aqui.",
+            "empty_title": "Fixe mensagens importantes para que elas possam ser facilmente descobertas",
+            "header": {
+                "one": "1 Mensagem fixada",
+                "other": "%(count)s Mensagens fixadas"
+            },
             "limits": {
                 "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",
+                "content": "Certifique-se de que você realmente deseja remover todas as mensagens fixadas. Essa ação não pode ser desfeita.",
+                "title": "Desfixar todas as mensagens?"
+            },
+            "view": "Ver no histórico"
         },
+        "pinned_messages_button": "Mensagens fixadas",
         "poll": {
+            "active_heading": "Enquetes ativas",
+            "empty_active": "Não há enquetes ativas nesta sala",
+            "empty_active_load_more": "Não há enquetes ativas. Carregue mais enquetes para ver as enquetes dos meses anteriores",
             "empty_active_load_more_n_days": {
                 "one": "Não há pesquisas ativas no último dia. Carregue mais enquetes para ver as enquetes dos meses anteriores",
                 "other": "Não há pesquisas ativas para os últimos %(count)s dias. Carregue mais enquetes para ver as enquetes dos meses anteriores"
             },
+            "empty_past": "Não há enquetes anteriores nesta sala",
+            "empty_past_load_more": "Não há enquetes anteriores. Carregue mais enquetes para ver as enquetes dos meses anteriores",
             "empty_past_load_more_n_days": {
                 "one": "Não há pesquisas anteriores para o dia anterior. Carregue mais enquetes para ver as enquetes dos meses anteriores",
                 "other": "Não há pesquisas anteriores nos últimos %(count)s dias. Carregue mais enquetes para ver as enquetes dos meses anteriores"
@@ -1501,7 +1881,16 @@
             "final_result": {
                 "one": "Resultado final baseado em %(count)s votos",
                 "other": "Resultado final baseado em %(count)s votos"
-            }
+            },
+            "load_more": "Carregar mais enquetes",
+            "loading": "Carregando enquetes",
+            "past_heading": "Enquetes anteriores",
+            "view_in_timeline": "Exibir enquete no histórico",
+            "view_poll": "Ver enquete"
+        },
+        "polls_button": "Enquetes",
+        "room_summary_card": {
+            "title": "Informação da sala"
         },
         "thread_list": {
             "context_menu_label": "Opções de tópico"
@@ -1511,30 +1900,52 @@
         }
     },
     "room": {
+        "3pid_invite_email_not_found_account": "Este convite foi enviado para %(email)s que não está associado à sua conta",
         "3pid_invite_email_not_found_account_room": "Este convite para %(roomName)s foi enviado para %(email)s, que não está associado à sua conta",
+        "3pid_invite_error_description": "Um erro (%(errcode)s) foi retornado ao tentar validar seu convite. Você pode tentar passar essas informações para a pessoa que o convidou.",
         "3pid_invite_error_invite_action": "Tentar entrar mesmo assim",
         "3pid_invite_error_invite_subtitle": "Você só pode participar com um convite válido.",
+        "3pid_invite_error_public_subtitle": "Você ainda pode entrar aqui.",
+        "3pid_invite_error_title": "Algo deu errado com seu convite.",
         "3pid_invite_error_title_room": "Ocorreu um erro no seu convite para %(roomName)s",
         "3pid_invite_no_is_subtitle": "Use um servidor de identidade em Configurações para receber convites diretamente no %(brand)s.",
+        "banned_by": "Você foi banido por %(memberName)s",
         "banned_from_room_by": "Você foi banido de %(roomName)s por %(memberName)s",
         "context_menu": {
             "copy_link": "Copiar link da sala",
             "favourite": "Favoritar",
             "forget": "Esquecer Sala",
             "low_priority": "Baixa prioridade",
+            "mark_read": "Marcar como lido",
+            "mark_unread": "Marcar como não lido",
+            "notifications_default": "Corresponder à configuração padrão",
+            "notifications_mute": "Silenciar sala",
             "title": "Opções da Sala",
             "unfavourite": "Favoritado"
         },
+        "creating_room_text": "Estamos​•​criando​•​uma​•​sala​•​com​•​%(names)s",
         "dm_invite_action": "Começar a conversa",
         "dm_invite_subtitle": "<userName/> quer conversar",
         "dm_invite_title": "Deseja conversar com %(user)s?",
         "drop_file_prompt": "Arraste um arquivo aqui para enviar",
         "edit_topic": "Editar tópico",
+        "error_3pid_invite_email_lookup": "Não foi possível encontrar o usuário por e-mail",
+        "error_cancel_knock_title": "Falha ao cancelar",
+        "error_join_403": "Você precisa de um convite para acessar esta sala.",
+        "error_join_404_1": "Você tentou entrar usando um ID de sala sem fornecer uma lista de servidores pelos quais ingressar. Os IDs das salas são identificadores internos e não podem ser usados para entrar em uma sala sem informações adicionais.",
+        "error_join_404_2": "Se você souber o endereço de uma sala, tente entrar por lá.",
         "error_join_404_invite": "A pessoa que o convidou já saiu ou o servidor dela está offline.",
         "error_join_404_invite_same_hs": "A pessoa que o convidou já saiu.",
         "error_join_connection": "Ocorreu um erro ao entrar.",
+        "error_join_incompatible_version_1": "Desculpe, seu servidor doméstico é muito antigo para participar aqui.",
         "error_join_incompatible_version_2": "Por favor, entre em contato com o administrador do seu homeserver.",
         "error_join_title": "Falha ao entrar",
+        "error_jump_to_date": "Servidor​•​retornou%(statusCode)s​•​com​•​código​•​de​•​erro%(errorCode)s",
+        "error_jump_to_date_connection": "Ocorreu um erro de rede ao tentar localizar e ir para a data especificada. Seu servidor doméstico pode estar inativo ou houve apenas um problema temporário com sua conexão com a Internet. Tente novamente. Se isso continuar, entre em contato com o administrador do servidor doméstico.",
+        "error_jump_to_date_details": "Detalhes​•​do​•​erro",
+        "error_jump_to_date_not_found": "Não​•​foi​•​possível​•​encontrar​•​um​•​evento​•​com​•​data​•​anterior​•​a​•​%(dateString)s.​•​Tente​•​escolher​•​uma​•​data​•​anterior.",
+        "error_jump_to_date_send_logs_prompt": "Envie​•​os​•​registros​•​de​•​<debugLogsLink>​•​depuração​•​</debugLogsLink>​•​para​•​nos​•​ajudar​•​a​•​rastrear​•​o​•​problema.",
+        "error_jump_to_date_title": "Não​•​foi​•​possível​•​encontrar​•​o​•​evento​•​nessa​•​data",
         "face_pile_summary": {
             "one": "%(count)s pessoa que você conhece já entrou",
             "other": "%(count)s pessoas que você conhece já entraram"
@@ -1545,8 +1956,10 @@
         },
         "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",
         "header": {
             "n_people_asking_to_join": {
                 "one": "Pedindo para participar",
@@ -1554,10 +1967,17 @@
             },
             "room_is_public": "Esta sala é pública"
         },
+        "header_avatar_open_settings_label": "Abrir configurações de sala",
+        "header_face_pile_tooltip": "Pessoas",
+        "header_untrusted_label": "Não confiável",
+        "inaccessible": "Esta sala ou espaço não está acessível neste momento.",
         "inaccessible_name": "%(roomName)s não está acessível neste momento.",
+        "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": {
             "dm_caption": "Apenas vocês dois estão nesta conversa, a menos que algum de vocês convide mais alguém.",
             "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.",
             "no_topic": "<a>Adicione uma descrição</a> para ajudar as pessoas a saber do que se trata essa conversa.",
             "private_unencrypted_warning": "Suas mensagens privadas normalmente são criptografadas, mas esta sala não é. Isto acontece normalmente por conta de um dispositivo ou método usado sem suporte, como convites via email, por exemplo.",
@@ -1572,7 +1992,7 @@
             "you_created": "Você criou esta sala."
         },
         "invite_email_mismatch_suggestion": "Compartilhe este e-mail em Configurações para receber convites diretamente no %(brand)s.",
-        "invite_reject_ignore": "Recusar e bloquear usuário",
+        "invite_sent_to_email": "Este convite foi enviado para %(email)s",
         "invite_sent_to_email_room": "Este convite para %(roomName)s foi enviado para %(email)s",
         "invite_subtitle": "Convidado por <userName/>",
         "invite_this_room": "Convidar para esta sala",
@@ -1580,6 +2000,7 @@
         "inviter_unknown": "Desconhecido",
         "invites_you_text": "<inviter/> convida você",
         "join_button_account": "Inscrever-se",
+        "join_failed_needs_invite": "Para ver %(roomName)s, você precisa de um convite",
         "join_the_discussion": "Participar da discussão",
         "join_title": "Entre na sala para participar",
         "join_title_account": "Participar da conversa com uma conta",
@@ -1589,30 +2010,66 @@
         "jump_read_marker": "Ir diretamente para a primeira das mensagens não lidas.",
         "jump_to_bottom_button": "Ir para as mensagens recentes",
         "jump_to_date": "Ir para Data",
+        "jump_to_date_beginning": "O​•​começo​•​da​•​sala",
+        "jump_to_date_prompt": "Escolha​•​uma​•​data​•​para​•​ir",
         "kick_reason": "Razão: %(reason)s",
+        "kicked_by": "Você foi removido por %(memberName)s",
+        "kicked_from_room_by": "Você foi removido de %(roomName)s por %(memberName)s",
+        "knock_cancel_action": "Cancelar solicitação",
+        "knock_denied_subtitle": "Como seu acesso foi negado, você não pode voltar a menos que seja convidado pelo administrador ou moderador do grupo.",
+        "knock_denied_title": "Seu acesso foi negado",
+        "knock_message_field_placeholder": "Mensagem (opcional)",
+        "knock_prompt": "Pedir para participar?",
+        "knock_prompt_name": "Pedir para participar de %(roomName)s?",
         "knock_send_action": "Solicitar acesso",
+        "knock_sent": "Solicitação de adesão enviada",
+        "knock_sent_subtitle": "Sua solicitação de adesão está pendente.",
         "knock_subtitle": "Você precisa ter acesso a esta sala para visualizar ou participar da conversa. Você pode enviar uma solicitação de adesão abaixo.",
         "leave_error_title": "Erro ao sair da sala",
         "leave_server_notices_description": "Esta sala é usada para mensagens importantes do Homeserver, então você não pode sair dela.",
         "leave_server_notices_title": "Não é possível sair da sala Avisos do Servidor",
         "leave_unexpected_error": "Erro inesperado no servidor, ao tentar sair da sala",
         "link_email_to_receive_3pid_invite": "Vincule esse e-mail à sua conta em Configurações, para receber convites diretamente no %(brand)s.",
+        "loading_preview": "Carregando pré-visualização",
         "no_peek_join_prompt": "%(roomName)s não pode ser visualizado. Deseja participar?",
+        "no_peek_no_name_join_prompt": "Não há pré-visualização, você gostaria de participar?",
+        "not_found_subtitle": "Tem certeza de que está no lugar certo?",
+        "not_found_title": "Esta sala ou espaço não existe.",
         "not_found_title_name": "%(roomName)s não existe.",
         "peek_join_prompt": "Você está visualizando %(roomName)s. Deseja participar?",
+        "pinned_message_badge": "Mensagem fixada",
+        "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.",
+            "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",
         "search": {
             "all_rooms_button": "Pesquisar todos as salas",
-            "placeholder": "Pesquisar mensagens..."
+            "placeholder": "Pesquisar mensagens...",
+            "summary": {
+                "one": "1 resultado encontrado para “<query/>”",
+                "other": "%(count)s resultados encontrados para “<query/>”"
+            },
+            "this_room_button": "Pesquise nesta sala"
         },
         "status_bar": {
+            "delete_all": "Excluir​•​tudo",
             "exceeded_resource_limit": "Sua mensagem não foi enviada porque este servidor local excedeu o limite de recursos. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
+            "homeserver_blocked": "Sua​•​mensagem​•​não​•​foi​•​enviada​•​porque​•​esse​•​servidor​•​doméstico​•​foi​•​bloqueado​•​pelo​•​administrador.​•​<a>Entre​•​em​•​contato​•​com​•​o​•​administrador​•​do​•​serviço​•​</a>​•​para​•​continuar​•​usando​•​o​•​serviço.",
             "monthly_user_limit_reached": "Sua mensagem não foi enviada porque este homeserver atingiu seu Limite de usuário ativo mensal. Por favor, <a>entre em contato com o seu administrador de serviços</a> para continuar usando o serviço.",
             "requires_consent_agreement": "Você não pode enviar nenhuma mensagem até revisar e concordar com <consentLink>nossos termos e condições</consentLink>.",
+            "retry_all": "Repetir​•​tudo",
+            "select_messages_to_retry": "Você​•​pode​•​selecionar​•​todas​•​as​•​mensagens​•​ou​•​mensagens​•​individuais​•​para​•​tentar​•​novamente​•​ou​•​excluir",
             "server_connectivity_lost_description": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
-            "server_connectivity_lost_title": "A conexão com o servidor foi perdida. Verifique sua conexão de internet."
+            "server_connectivity_lost_title": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
+            "some_messages_not_sent": "Algumas​•​de​•​suas​•​mensagens​•​não​•​foram​•​enviadas"
         },
+        "unknown_status_code_for_timeline_jump": "código​•​de​•​status​•​desconhecido",
         "unread_notifications_predecessor": {
             "other": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala.",
             "one": "Você tem %(count)s notificações não lidas em uma versão anterior desta sala."
@@ -1629,31 +2086,91 @@
                 "other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos"
             },
             "uploading_single_file": "Enviando o arquivo %(filename)s"
-        }
+        },
+        "video_room": "Esta sala é uma sala de vídeo",
+        "waiting_for_join_subtitle": "Uma​•​vez​•​que​•​os​•​usuários​•​convidados​•​tenham​•​entrado​•​em​•​%(brand)s,​•​você​•​poderá​•​conversar​•​e​•​a​•​sala​•​será​•​criptografada​•​de​•​ponta​•​a​•​ponta",
+        "waiting_for_join_title": "Aguardando​•​que​•​os​•​usuários​•​se​•​juntem​•​a​•​%(brand)s"
     },
     "room_list": {
         "add_room_label": "Adicionar sala",
         "add_space_label": "Adicionar espaço",
         "breadcrumbs_empty": "Nenhuma sala foi visitada recentemente",
         "breadcrumbs_label": "Salas visitadas recentemente",
+        "empty": {
+            "no_chats": "Ainda não há conversas.",
+            "no_chats_description": "Comece enviando uma mensagem para alguém ou criando uma sala",
+            "no_chats_description_no_room_rights": "Comece enviando uma mensagem para alguém",
+            "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_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",
+            "no_rooms": "Você não está em nenhuma sala ainda",
+            "no_rooms_description": "Você pode desmarcar os filtros para ver suas outras conversas.",
+            "no_unread": "Parabéns! Você não tem nenhuma mensagem não lida",
+            "show_activity": "Ver todas as atividades",
+            "show_chats": "Mostrar todas as conversas"
+        },
         "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",
+            "unread": "Não lido"
+        },
         "home_menu_label": "Opções do Início",
         "join_public_room_label": "Entrar na sala pública",
         "joining_rooms_status": {
             "one": "Entrando na %(count)s sala",
             "other": "Entrando atualmente em %(count)s salas"
         },
+        "list_title": "Lista de salas",
+        "more_options": {
+            "copy_link": "Copiar link da sala",
+            "favourited": "Favoritado",
+            "leave_room": "Sair da sala",
+            "low_priority": "Baixa prioridade",
+            "mark_read": "Marcar como lido",
+            "mark_unread": "Marcar como não lido"
+        },
         "notification_options": "Alterar notificações",
+        "open_space_menu": "Abrir menu do espaço",
+        "primary_filters": "Filtros da lista de salas",
+        "redacting_messages_status": {
+            "one": "Atualmente removendo mensagens em %(count)s sala",
+            "other": "Atualmente removendo mensagens em %(count)s salas"
+        },
+        "room": {
+            "more_options": "Mais opções",
+            "open_room": "Abrir sala %(roomName)s"
+        },
+        "room_options": "Opções da Sala",
         "show_less": "Mostrar menos",
         "show_n_more": {
             "other": "Mostrar %(count)s a mais",
             "one": "Mostrar %(count)s a mais"
         },
         "show_previews": "Mostrar pré-visualizações de mensagens",
+        "sort": "Ordenar",
         "sort_by": "Classificar por",
         "sort_by_activity": "Atividade recente",
+        "sort_by_alphabet": "De A a Z",
+        "sort_type": {
+            "activity": "Atividade",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Mostrar salas não lidas em primeiro",
+        "space_menu": {
+            "home": "Espaço",
+            "space_settings": "Configurações de espaço"
+        },
+        "space_menu_label": "Menu de %(spaceName)s",
         "sublist_options": "Opções da Lista",
         "suggested_rooms_heading": "Salas sugeridas"
     },
@@ -1667,11 +2184,14 @@
             "error_upgrade_title": "Falha ao atualizar a sala",
             "information_section_room": "Informação da sala",
             "information_section_space": "Informações do espaço",
+            "room_id": "ID interno da sala",
             "room_predecessor": "Ler mensagens antigas em %(roomName)s.",
             "room_upgrade_button": "Atualizar a versão desta sala",
             "room_upgrade_warning": "<b>Aviso</b> : atualizar um quarto irá<i> não migre automaticamente os membros da sala para a nova versão da sala.</i> Publicaremos um link para a nova sala na versão antiga da sala - os membros da sala terão que clicar neste link para entrar na nova sala.",
             "room_version": "Versão da sala:",
             "room_version_section": "Versão da sala",
+            "space_predecessor": "Exibir a versão mais antiga de %(spaceName)s.",
+            "space_upgrade_button": "Atualize este espaço para a versão de sala recomendada",
             "unfederated": "Esta sala não é acessível para servidores Matrix remotos",
             "upgrade_button": "Atualize essa sala para versão %(version)s",
             "upgrade_dialog_description": "Atualizar esta sala irá fechar a instância atual da sala e, em seu lugar, criar uma sala atualizada com o mesmo nome. Para oferecer a melhor experiência possível aos integrantes da sala, nós iremos:",
@@ -1684,7 +2204,10 @@
             "upgrade_warning_dialog_description": "Atualizar uma sala é uma ação avançada e geralmente é recomendada quando uma sala está instável devido a erros, recursos ausentes ou vulnerabilidades de segurança.",
             "upgrade_warning_dialog_explainer": "<b>Por favor, note que a atualização criará uma nova versão do quarto</b> . Todas as mensagens atuais permanecerão nesta sala arquivada.",
             "upgrade_warning_dialog_footer": "Você atualizará esta sala de <oldVersion /> para <newVersion />.",
+            "upgrade_warning_dialog_invite_label": "Convide automaticamente membros desta sala para a nova",
+            "upgrade_warning_dialog_report_bug_prompt": "Isso geralmente afeta apenas como a sala é processada no servidor. Se você tiver problemas com o %(brand)s, <a>informe um erro</a>.",
             "upgrade_warning_dialog_report_bug_prompt_link": "Isso geralmente afeta apenas como a sala é processada no servidor. Se você tiver problemas com o %(brand)s, <a>informe um erro</a>.",
+            "upgrade_warning_dialog_title": "Atualizar a sala",
             "upgrade_warning_dialog_title_private": "Atualizar a sala privada"
         },
         "alias_not_specified": "não especificado",
@@ -1695,9 +2218,13 @@
         },
         "delete_avatar_label": "Remover foto de perfil",
         "general": {
+            "alias_field_has_domain_invalid": "Separador de domínio ausente, por exemplo, (:domain.org)",
+            "alias_field_has_localpart_invalid": "Nome da sala ou separador ausente, por exemplo, (my-room:domain.org)",
+            "alias_field_matches_invalid": "Este endereço não aponta para esta sala",
             "alias_field_placeholder_default": "por exemplo: minha-sala",
             "alias_field_required_invalid": "Por favor, digite um endereço",
             "alias_field_safe_localpart_invalid": "Alguns caracteres não são permitidos",
+            "alias_field_taken_invalid": "Este endereço tem um servidor inválido ou já está em uso",
             "alias_field_taken_invalid_domain": "Este endereço já está em uso",
             "alias_field_taken_valid": "Este endereço está disponível para uso",
             "alias_heading": "Endereço da sala",
@@ -1714,6 +2241,8 @@
             "error_deleting_alias_description": "Ocorreu um erro ao remover esse endereço. Ele pode não mais existir ou houve um problema temporário.",
             "error_deleting_alias_description_forbidden": "Você não tem permissão para excluir este endereço.",
             "error_deleting_alias_title": "Erro ao remover o endereço",
+            "error_publishing": "Não é possível publicar a sala",
+            "error_publishing_detail": "Houve um erro ao publicar esta sala",
             "error_save_space_settings": "Falha ao salvar as configurações desse espaço.",
             "error_updating_alias_description": "Ocorreu um erro ao atualizar o endereço alternativo da sala. Isso pode não ser permitido pelo servidor ou houve um problema temporário.",
             "error_updating_canonical_alias_description": "Ocorreu um erro ao atualizar o endereço principal da sala. Isso pode não ser permitido pelo servidor ou houve um problema temporário.",
@@ -1747,9 +2276,19 @@
             "notification_sound": "Som de notificação",
             "settings_link": "Receba notificações conforme configurado em suas <a>configurações</a>",
             "sounds_section": "Sons",
+            "upload_sound_label": "Carregar som personalizado",
             "uploaded_sound": "Som enviado"
         },
+        "people": {
+            "knock_empty": "Nenhuma solicitação",
+            "knock_section": "Pedir para participar",
+            "see_less": "Ver menos",
+            "see_more": "Ver mais"
+        },
         "permissions": {
+            "add_privileged_user_description": "Dê mais privilégios a um ou mais usuários nesta sala",
+            "add_privileged_user_filter_placeholder": "Pesquisar usuários nesta sala...",
+            "add_privileged_user_heading": "Adicione usuários privilegiados",
             "ban": "Banir usuários",
             "ban_reason": "Razão",
             "banned_by": "Banido por %(displayName)s",
@@ -1788,7 +2327,7 @@
             "permissions_section": "Permissões",
             "permissions_section_description_room": "Selecione os cargos necessários para alterar várias partes da sala",
             "permissions_section_description_space": "Selecionar os cargos necessários para alterar certas partes do espaço",
-            "privileged_users_section": "Usuárias/os privilegiadas/os",
+            "privileged_users_section": "Usuários privilegiados",
             "redact": "Remover mensagens enviadas por outros",
             "send_event_type": "Enviar eventos de %(eventType)s",
             "state_default": "Alterar configurações",
@@ -1809,7 +2348,7 @@
             "error_join_rule_change_title": "Falha ao atualizar as regras de entrada",
             "error_join_rule_change_unknown": "Falha desconhecida",
             "guest_access_warning": "Pessoas com clientes suportados poderão entrar na sala sem ter uma conta registrada.",
-            "history_visibility_invited": "Apenas participantes (desde que foram convidadas/os)",
+            "history_visibility_invited": "Somente membros (desde que tenham sido convidados)",
             "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)",
@@ -1818,12 +2357,23 @@
             "join_rule_description": "Decida quem pode entrar em %(roomName)s.",
             "join_rule_invite": "Privado (convite apenas)",
             "join_rule_invite_description": "Apenas pessoas convidadas podem entrar.",
+            "join_rule_knock": "Pedir para participar",
+            "join_rule_knock_description": "As pessoas não podem participar a menos que o acesso seja concedido.",
             "join_rule_public_description": "Todos podem encontrar e entrar.",
             "join_rule_restricted": "Membros do espaço",
             "join_rule_restricted_description": "Qualquer um em um espaço pode encontrar e se juntar. <a>Edite quais espaços podem ser acessados aqui.</a>",
             "join_rule_restricted_description_active_space": "Qualquer um em <spaceName/> pode encontrar e se juntar. Você pode selecionar outros espaços também.",
             "join_rule_restricted_description_prompt": "Qualquer um em um espaço pode encontrar e se juntar. Você pode selecionar múltiplos espaços.",
             "join_rule_restricted_description_spaces": "Espaço com acesso",
+            "join_rule_restricted_dialog_description": "Decida quais espaços podem acessar essa sala. Se um espaço for selecionado, seus membros poderão encontrar e participar de <RoomName/>.",
+            "join_rule_restricted_dialog_empty_warning": "Você está removendo todos os espaços. O acesso será definido como padrão somente para convidados",
+            "join_rule_restricted_dialog_filter_placeholder": "Pesquisar espaços",
+            "join_rule_restricted_dialog_heading_known": "Outros espaços que você conhece",
+            "join_rule_restricted_dialog_heading_other": "Outros espaços ou salas que você talvez não conheça",
+            "join_rule_restricted_dialog_heading_room": "Espaços que você conhece que contêm esta sala",
+            "join_rule_restricted_dialog_heading_space": "Espaços que você conhece que contêm esse espaço",
+            "join_rule_restricted_dialog_heading_unknown": "Provavelmente são aquelas das quais outros administradores de salas fazem parte.",
+            "join_rule_restricted_dialog_title": "Selecione espaços",
             "join_rule_restricted_n_more": {
                 "other": "e %(count)s mais",
                 "one": "& %(count)s mais"
@@ -1846,7 +2396,9 @@
             },
             "join_rule_upgrade_upgrading_room": "Atualizando sala",
             "public_without_alias_warning": "Para criar um link para esta sala, antes adicione um endereço.",
-            "strict_encryption": "Nunca envie mensagens criptografadas a partir desta sessão para sessões não confirmadas nessa sala",
+            "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.",
+            "strict_encryption": "Envie mensagens somente para usuários verificados.",
             "title": "Segurança e privacidade"
         },
         "title": "Configurações da sala - %(roomName)s",
@@ -1863,6 +2415,12 @@
             "history_visibility_anyone_space_description": "Permite que pessoas vejam seu espaço antes de entrarem.",
             "history_visibility_anyone_space_recommendation": "Recomendado para espaços públicos.",
             "title": "Visibilidade"
+        },
+        "voip": {
+            "call_type_section": "Tipo de chamada",
+            "enable_element_call_caption": "%(brand)s é criptografado de ponta a ponta, mas atualmente está limitado a um número menor de usuários.",
+            "enable_element_call_label": "Ativar %(brand)s como uma opção de chamada adicional nesta sala",
+            "enable_element_call_no_permissions_tooltip": "Você não tem permissões suficientes para alterar isso."
         }
     },
     "room_summary_card_back_action_label": "Informação da sala",
@@ -1894,8 +2452,16 @@
         "recent_changes_heading": "Alterações recentes que ainda não foram recebidas",
         "title": "O servidor não está respondendo"
     },
+    "service_worker_error": {
+        "description": "%(brand)s requer um operador de serviço para carregar mídia autenticada de repositórios de conteúdo Matrix. Isso não é suportado pelo seu navegador, portanto, pode ocorrer uma falha no carregamento de mídia.",
+        "title": "Falha ao carregar o operador de serviço"
+    },
     "seshat": {
         "error_initialising": "Falha na inicialização da pesquisa por mensagem, confire <a>suas configurações</a> para mais informações",
+        "reset_button": "Redefinir armazenamento de eventos",
+        "reset_description": "Você provavelmente não deseja redefinir seu armazenamento de índice de eventos",
+        "reset_explainer": "Se você fizer isso, observe que nenhuma de suas mensagens será excluída, mas a experiência de pesquisa poderá ser prejudicada por alguns instantes enquanto o índice é recriado",
+        "reset_title": "Redefinir armazenamento de eventos?",
         "warning_kind_files": "Esta versão do %(brand)s não permite visualizar alguns arquivos criptografados",
         "warning_kind_files_app": "Use o <a>app para Computador</a> para ver todos os arquivos criptografados",
         "warning_kind_search": "Esta versão do %(brand)s não permite buscar mensagens criptografadas",
@@ -1906,33 +2472,45 @@
             "access_token_detail": "Seu token de acesso dá acesso total à sua conta. Não o compartilhe com ninguém.",
             "brand_version": "versão do %(brand)s:",
             "clear_cache_reload": "Limpar cache e recarregar",
+            "crypto_version": "Versão Crypto:",
             "dialog_title": "<strong>Configurações:</strong> Ajuda e Sobre",
             "help_link": "Para obter ajuda com o uso do %(brand)s, clique <a>aqui</a>.",
+            "homeserver": "O servidor doméstico é <code>%(homeserverUrl)s</code>",
+            "identity_server": "O servidor de identidade é <code>%(identityServerUrl)s</code>",
             "title": "Ajuda e sobre",
             "versions": "Versões"
         }
     },
     "settings": {
         "account": {
-            "dialog_title": "<strong>Configurações:</strong> Conta"
+            "dialog_title": "<strong>Configurações:</strong> Conta",
+            "title": "Conta"
         },
         "all_rooms_home": "Mostrar todas as salas no Início",
         "all_rooms_home_description": "Todas as salas que você estiver presente aparecerão no Início.",
         "always_show_message_timestamps": "Sempre mostrar as datas das mensagens",
         "appearance": {
+            "bundled_emoji_font": "Use a fonte de emoji incluída no pacote",
+            "compact_layout": "Mostrar texto e mensagens compactas",
+            "compact_layout_description": "O layout moderno deve ser selecionado para usar esse recurso.",
             "custom_font": "Usar uma fonte do sistema",
             "custom_font_description": "Defina o nome de uma fonte instalada no seu sistema e o %(brand)s tentará usá-la.",
             "custom_font_name": "Nome da fonte do sistema",
             "custom_font_size": "Usar tamanho personalizado",
+            "custom_theme_add": "Adicionar tema personalizado",
+            "custom_theme_downloading": "Baixando tema personalizado...",
             "custom_theme_error_downloading": "Erro ao baixar o tema",
+            "custom_theme_help": "Insira o URL de um tema personalizado que você deseja aplicar.",
             "custom_theme_invalid": "Esquema inválido de tema.",
             "dialog_title": "<strong>Configurações:</strong> Aparência",
             "font_size": "Tamanho da fonte",
+            "font_size_default": "%(fontSize)s (padrão)",
+            "high_contrast": "Alto contraste",
             "image_size_default": "Padrão",
             "image_size_large": "Grande",
             "layout_bubbles": "Balões de mensagem",
             "layout_irc": "IRC (experimental)",
-            "match_system_theme": "Se adaptar ao tema do sistema",
+            "match_system_theme": "Se adaptar ao padrão do sistema",
             "timeline_image_size": "Tamanho da imagem na linha do tempo"
         },
         "automatic_language_detection_syntax_highlight": "Ativar detecção automática de idioma para ressaltar erros de ortografia",
@@ -1942,9 +2520,80 @@
         "code_block_expand_default": "Expandir blocos de código por padrão",
         "code_block_line_numbers": "Mostrar o número da linha em blocos de código",
         "disable_historical_profile": "Mostrar a foto e o nome do perfil atual dos usuários no histórico de mensagens",
+        "discovery": {
+            "title": "Como encontrar você"
+        },
         "emoji_autocomplete": "Ativar sugestões de emojis ao digitar",
         "enable_markdown": "Habilitar markdown",
-        "enable_markdown_description": "Inicie mensagens com <code> /plain </code> para enviar sem marcação.",
+        "enable_markdown_description": "Inicie as mensagens com <code>/plain</code> para enviar sem markdown.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Os detalhes da sua conta, contatos, preferências e lista de bate-papo serão mantidos",
+                "breadcrumb_page": "Redefinir criptografia",
+                "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_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.",
+                "details_title": "Detalhes da criptografia",
+                "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_label": "Nunca envie mensagens criptografadas para dispositivos não verificados",
+                "other_people_device_title": "Dispositivos de outras pessoas",
+                "reset_identity": "Redefinir identidade criptográfica",
+                "reset_in_progress": "Redefinição em andamento...",
+                "session_id": "ID da sessão:",
+                "session_key": "Chave da sessão:",
+                "title": "Avançado"
+            },
+            "confirm_key_storage_off": "Tem certeza de que deseja manter o armazenamento de chaves desativado?",
+            "confirm_key_storage_off_description": "Se você sair de todos os seus dispositivos, perderá o histórico de mensagens e precisará verificar todos os seus contatos existentes novamente. <a>Saiba mais</a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "Excluir armazenamento de chaves",
+                "confirm": "Excluir armazenamento de chaves",
+                "description": "A exclusão do armazenamento de chaves removerá sua identidade criptográfica e as chaves de mensagem do servidor e desativará os seguintes recursos de segurança:",
+                "list_first": "Você não terá histórico de mensagens criptografadas em novos dispositivos",
+                "list_second": "Você perderá o acesso às suas mensagens criptografadas se estiver desconectado de %(brand)s em todos os lugares",
+                "title": "Tem certeza de que deseja desativar o armazenamento de chaves e excluí-lo?"
+            },
+            "device_not_verified_button": "Verificar este dispositivo",
+            "device_not_verified_description": "Você precisa verificar este dispositivo para visualizar suas configurações de criptografia.",
+            "device_not_verified_title": "Dispositivo não verificado",
+            "dialog_title": "<strong>Configurações: </strong> Criptografia",
+            "key_storage": {
+                "allow_key_storage": "Permitir o armazenamento de chaves",
+                "description": "Armazene sua identidade criptográfica e chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em quaisquer novos dispositivos.<a> Saber mais</a>",
+                "title": "Armazenamento de chaves"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "Confirme a nova chave de recuperação",
+                "change_recovery_confirm_description": "Insira sua nova chave de recuperação abaixo para concluir. Seu antigo não funcionará mais.",
+                "change_recovery_confirm_title": "Insira sua nova chave de recuperação",
+                "change_recovery_key": "Alterar chave de recuperação",
+                "change_recovery_key_description": "Anote esta nova chave de recuperação em algum lugar seguro. Então clique em Continue para confirmar a alteração.",
+                "change_recovery_key_title": "Alterar a chave de recuperação?",
+                "description": "Recupere sua identidade criptográfica e histórico de mensagens com uma chave de recuperação se você tiver perdido todos os seus dispositivos existentes.",
+                "enter_key_error": "A chave de recuperação que você inseriu não está correta.",
+                "enter_recovery_key": "Insira a chave de recuperação",
+                "forgot_recovery_key": "Esqueceu a chave de recuperação?",
+                "key_storage_warning": "Seu armazenamento de chaves está fora de sincronia. Clique em um dos botões abaixo para corrigir o problema.",
+                "save_key_description": "Não compartilhe isso com ninguém!",
+                "save_key_title": "Chave de recuperação",
+                "set_up_recovery": "Configurar a recuperação",
+                "set_up_recovery_confirm_button": "Concluir a configuração",
+                "set_up_recovery_confirm_description": "Digite a chave de recuperação mostrada na tela anterior para concluir a configuração da recuperação.",
+                "set_up_recovery_confirm_title": "Digite sua chave de recuperação para confirmar",
+                "set_up_recovery_description": "Seu armazenamento de chaves é protegido por uma chave de recuperação. Se precisar de uma nova chave de recuperação após a configuração, você pode recriá-la selecionando '%(changeRecoveryKeyButton)s'.",
+                "set_up_recovery_save_key_description": "Anote essa chave de recuperação em algum lugar seguro, como um gerenciador de senhas, uma nota criptografada ou um cofre físico.",
+                "set_up_recovery_save_key_title": "Salve sua chave de recuperação",
+                "set_up_recovery_secondary_description": "Depois de clicar em continuar, geraremos uma chave de recuperação para você.",
+                "title": "Recuperação"
+            },
+            "title": "Criptografia"
+        },
         "general": {
             "account_management_section": "Gerenciamento da Conta",
             "account_section": "Conta",
@@ -1957,6 +2606,14 @@
             "add_msisdn_dialog_title": "Adicionar número de telefone",
             "add_msisdn_instructions": "Digite o código de confirmação enviado por mensagem de texto para +%(msisdn)s.",
             "add_msisdn_misconfigured": "O fluxo de adição/vinculação com MSISDN está mal configurado",
+            "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_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.",
+            "avatar_upload_error_text_generic": "O formato do arquivo pode não ser suportado.",
+            "avatar_upload_error_title": "Não foi possível carregar a imagem de perfil",
             "confirm_adding_email_body": "Clique no botão abaixo para confirmar a adição deste endereço de e-mail.",
             "confirm_adding_email_title": "Confirmar a inclusão de e-mail",
             "deactivate_confirm_body": "Tem certeza de que deseja desativar sua conta? Isso é irreversível.",
@@ -1976,7 +2633,10 @@
             "discovery_email_verification_instructions": "Verifique o link na sua caixa de e-mails",
             "discovery_msisdn_empty": "As opções de descoberta aparecerão depois que você adicionar um número de telefone.",
             "discovery_needs_terms": "Concorde com os Termos de Serviço do servidor de identidade (%(serverName)s), para que você possa ser descoberto por endereço de e-mail ou por número de celular.",
+            "discovery_needs_terms_title": "Deixe que as pessoas encontrem você",
             "display_name": "Nome de exibição",
+            "display_name_error": "Não foi possível definir o nome de exibição",
+            "email_adding_unsupported_by_hs": "Este servidor doméstico não suporta a adição de endereços de e-mail à sua conta.",
             "email_address_in_use": "Este endereço de email já está em uso",
             "email_address_label": "Endereço de e-mail",
             "email_not_verified": "Seu endereço de e-mail ainda não foi confirmado",
@@ -2001,7 +2661,9 @@
             "error_share_msisdn_discovery": "Não foi possível compartilhar o número de celular",
             "identity_server_no_token": "Nenhum token de acesso à identidade foi encontrado",
             "identity_server_not_set": "Servidor de identidade não definido",
+            "invalid_phone_number": "O número de telefone fornecido não parece ser válido.",
             "language_section": "Idioma",
+            "msisdn_adding_unsupported_by_hs": "Este servidor doméstico não suporta a adição de números de telefone à sua conta.",
             "msisdn_in_use": "Este número de telefone já está em uso",
             "msisdn_label": "Número de telefone",
             "msisdn_verification_field_label": "Código de confirmação",
@@ -2010,12 +2672,16 @@
             "oidc_manage_button": "Gerenciar conta",
             "password_change_section": "Defina uma nova senha da conta...",
             "password_change_success": "Sua senha foi alterada com sucesso.",
+            "personal_info": "Informações pessoais",
             "profile_subtitle": "É assim que você aparece para outras pessoas no aplicativo.",
+            "profile_subtitle_oidc": "Sua conta é gerenciada separadamente por um provedor de identidade e, portanto, algumas de suas informações pessoais não podem ser alteradas aqui.",
             "remove_email_prompt": "Remover %(email)s?",
             "remove_msisdn_prompt": "Remover %(phone)s?",
-            "spell_check_locale_placeholder": "Escolha um local"
+            "spell_check_locale_placeholder": "Escolha um local",
+            "unable_to_load_emails": "Não é possível carregar endereços de e-mail",
+            "unable_to_load_msisdns": "Não é possível carregar números de telefone",
+            "username": "Nome de usuário"
         },
-        "image_thumbnails": "Mostrar miniaturas e resumos para imagens",
         "inline_url_previews_default": "Ativar, por padrão, a visualização de resumo de links",
         "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ê)",
@@ -2038,7 +2704,7 @@
                 "enter_phrase_title": "Digite uma frase de segurança",
                 "enter_phrase_to_confirm": "Digite sua frase de segurança uma segunda vez para confirmá-la.",
                 "generate_security_key_description": "Geraremos uma chave de segurança para você armazenar em algum lugar seguro, como um gerenciador de senhas ou um cofre.",
-                "generate_security_key_title": "Gerar uma Chave de Segurança",
+                "generate_security_key_title": "Gerar uma chave de recuperação",
                 "pass_phrase_match_failed": "Isto não corresponde.",
                 "pass_phrase_match_success": "Isto corresponde!",
                 "phrase_strong_enough": "Ótimo! Essa frase de segurança parece ser segura o suficiente.",
@@ -2047,11 +2713,11 @@
                 "set_phrase_again": "Voltar para configurar novamente.",
                 "settings_reminder": "Você também pode configurar o Backup online & configurar as suas senhas nas Configurações.",
                 "title_confirm_phrase": "Confirme a frase de segurança",
-                "title_save_key": "Salve sua Chave de Segurança",
+                "title_save_key": "Salve sua chave de recuperação",
                 "title_set_phrase": "Defina uma frase de segurança",
                 "unable_to_setup": "Não foi possível definir o armazenamento secreto",
                 "use_different_passphrase": "Usar uma frase secreta diferente?",
-                "use_phrase_only_you_know": "Use uma frase secreta que apenas você conhece, e opcionalmente salve uma Chave de Segurança para acessar o backup."
+                "use_phrase_only_you_know": "Use uma frase secreta que só você conhece e, opcionalmente, salve uma Chave de Recuperação para usar como backup."
             }
         },
         "key_export_import": {
@@ -2078,6 +2744,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Configurações:</strong> Usuários ignorados"
         },
+        "media_preview": {
+            "hide_avatars": "Ocultar avatares da sala e do convidador",
+            "hide_media": "Ocultar sempre",
+            "media_preview_description": "Uma mídia oculta sempre pode ser exibida tocando nela",
+            "media_preview_label": "Mostrar mídia na linha do tempo",
+            "show_in_private": "Em salas privadas",
+            "show_media": "Mostrar sempre"
+        },
         "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)",
@@ -2125,7 +2799,7 @@
             "rule_contains_user_name": "Mensagens contendo meu nome de usuário",
             "rule_encrypted": "Mensagens criptografadas em salas",
             "rule_encrypted_room_one_to_one": "Mensagens criptografadas em conversas individuais",
-            "rule_invite_for_me": "Quando eu for convidada(o) a uma sala",
+            "rule_invite_for_me": "Quando sou convidado para uma sala",
             "rule_message": "Mensagens em salas",
             "rule_room_one_to_one": "Mensagens em conversas individuais",
             "rule_roomnotif": "Mensagens contendo @room",
@@ -2141,6 +2815,7 @@
             "code_blocks_heading": "Blocos de código",
             "compact_modern": "Usar um layout \"moderno\" mais compacto",
             "composer_heading": "Campo de texto",
+            "default_timezone": "Navegador padrão (%(timezone)s)",
             "dialog_title": "<strong>Configurações:</strong> Preferências",
             "enable_hardware_acceleration": "Habilitar aceleração de hardware",
             "enable_tray_icon": "Mostrar o ícone da bandeja e minimizar a janela ao fechar",
@@ -2148,6 +2823,7 @@
             "keyboard_view_shortcuts_button": "Para ver todos os atalhos do teclado, <a>clique aqui</a>.",
             "media_heading": "Imagens, GIFs e vídeos",
             "presence_description": "Compartilhe sua atividade e status com outras pessoas.",
+            "publish_timezone": "Publique o fuso horário no perfil público",
             "rm_lifetime": "Duração do marcador de leitura (ms)",
             "rm_lifetime_offscreen": "Vida útil do marcador de leitura fora da tela (ms)",
             "room_directory_heading": "Diretório de salas",
@@ -2155,60 +2831,26 @@
             "show_avatars_pills": "Mostrar avatares em menções de usuários, salas e eventos",
             "show_polls_button": "Mostrar botão de enquetes",
             "surround_text": "Circule o texto selecionado ao digitar caracteres especiais",
-            "time_heading": "Exibindo tempo"
+            "time_heading": "Exibindo tempo",
+            "user_timezone": "Definir fuso horário"
         },
         "prompt_invite": "Avisar antes de enviar convites para IDs da Matrix potencialmente inválidas",
         "replace_plain_emoji": "Substituir automaticamente os emojis em texto",
         "security": {
-            "4s_public_key_in_account_data": "nos dados de conta",
-            "4s_public_key_status": "Chave pública do armazenamento secreto:",
             "analytics_description": "Compartilhe dados anônimos para nos ajudar a identificar problemas. Nada pessoal. Sem terceiros.",
-            "backup_key_cached_status": "Backup da chave em cache:",
-            "backup_key_stored_status": "Backup da chave armazenada:",
-            "backup_key_unexpected_type": "tipo inesperado",
-            "backup_key_well_formed": "bem formado",
-            "backup_keys_description": "Faça backup de suas chaves de criptografia com os dados da sua conta, para se prevenir a perder o acesso às suas sessões. Suas chaves serão protegidas por uma Chave de Segurança exclusiva.",
             "bulk_options_accept_all_invites": "Aceite todos os convites de %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Recusar todos os %(invitedRooms)s convites",
             "bulk_options_section": "Opções em massa",
-            "cross_signing_cached": "armazenado localmente",
-            "cross_signing_homeserver_support": "Recursos suportados pelo servidor:",
-            "cross_signing_homeserver_support_exists": "existe",
-            "cross_signing_in_4s": "em armazenamento secreto",
-            "cross_signing_in_memory": "na memória",
-            "cross_signing_master_private_Key": "Chave privada principal:",
-            "cross_signing_not_cached": "não encontrado localmente",
-            "cross_signing_not_found": "não encontradas",
-            "cross_signing_not_in_4s": "não encontrado no armazenamento",
-            "cross_signing_not_stored": "não armazenado",
-            "cross_signing_private_keys": "Chaves privadas de autoverificação:",
-            "cross_signing_public_keys": "Chaves públicas de autoverificação:",
-            "cross_signing_self_signing_private_key": "Chave privada auto-assinada:",
-            "cross_signing_user_signing_private_key": "Chave privada de assinatura da(do) usuária(o):",
-            "cryptography_section": "Criptografia",
-            "delete_backup": "Remover backup",
-            "delete_backup_confirm_description": "Tem certeza? Você perderá suas mensagens criptografadas se não tiver feito o backup de suas chaves.",
+            "dehydrated_device_description": "O recurso de dispositivo offline permite que você receba mensagens criptografadas mesmo quando você não está conectado a nenhum dispositivo",
+            "dehydrated_device_enabled": "Dispositivo offline habilitado",
             "dialog_title": "<strong>Configurações:</strong> Segurança e Privacidade",
             "e2ee_default_disabled_warning": "O administrador do servidor desativou a criptografia de ponta a ponta por padrão em salas privadas e em conversas.",
             "enable_message_search": "Ativar busca de mensagens em salas criptografadas",
             "encryption_section": "Criptografia",
-            "error_loading_key_backup_status": "Não foi possível carregar o status do backup da chave",
-            "export_megolm_keys": "Exportar chaves ponta-a-ponta da sala",
             "ignore_users_empty": "Você não tem usuários ignorados.",
             "ignore_users_section": "Usuários bloqueados",
-            "import_megolm_keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
-            "key_backup_active": "Esta sessão está fazendo backup de suas chaves.",
-            "key_backup_active_version": "Versão de backup ativo:",
-            "key_backup_active_version_none": "Nenhuma",
             "key_backup_algorithm": "Algoritmo:",
-            "key_backup_can_be_restored": "Esse backup pode ser restaurado nesta sessão",
-            "key_backup_complete": "O backup de todas as chaves foi realizado",
             "key_backup_connect": "Autorize esta sessão a fazer o backup de chaves",
-            "key_backup_connect_prompt": "Autorize esta sessão a fazer o backup de chaves antes de se desconectar, para evitar perder chaves que possam estar apenas nesta sessão.",
-            "key_backup_in_progress": "Fazendo backup de chaves: %(sessionsRemaining)s",
-            "key_backup_inactive": "Esta sessão <b>não está fazendo backup de suas chaves</b>, mas você tem um backup existente que pode restaurar para continuar.",
-            "key_backup_inactive_warning": "Suas chaves <b>não estão sendo copiadas desta sessão</b>.",
-            "key_backup_latest_version": "Versão mais recente do backup no servidor:",
             "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": {
@@ -2228,14 +2870,8 @@
             "message_search_unsupported": "%(brand)s precisa de componentes adicionais para pesquisar as mensagens criptografadas armazenadas localmente. Se quiser testar esse recurso, construa uma versão do %(brand)s para Computador com <nativeLink>componentes de busca ativados</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s não consegue pesquisar as mensagens criptografadas armazenadas localmente em um navegador de internet. Use o <desktopLink>%(brand)s para Computador</desktopLink> para que as mensagens criptografadas sejam exibidas nos resultados de buscas.",
             "record_session_details": "Registre o nome, a versão e o URL do cliente para reconhecer as sessões com mais facilidade no gerenciador de sessões",
-            "restore_key_backup": "Restaurar do backup",
-            "secret_storage_not_ready": "não está pronto",
-            "secret_storage_ready": "pronto",
-            "secret_storage_status": "Armazenamento secreto:",
             "send_analytics": "Enviar dados analíticos",
-            "session_id": "ID da sessão:",
-            "session_key": "Chave da sessão:",
-            "strict_encryption": "Nunca envie mensagens criptografadas a partir desta sessão para sessões não confirmadas"
+            "strict_encryption": "Envie mensagens somente para usuários verificados"
         },
         "send_read_receipts": "Enviar confirmações de leitura",
         "send_read_receipts_unsupported": "Seu servidor não suporta a desativação do envio de confirmações de leitura.",
@@ -2283,6 +2919,7 @@
             "inactive_sessions_list_description": "Considere sair de sessões antigas (%(inactiveAgeDays)sdias ou mais) que você não usa mais.",
             "ip": "Endereço de IP",
             "last_activity": "Última atividade",
+            "manage": "Gerenciar esta sessão",
             "mobile_session": "Sessão móvel",
             "n_sessions_selected": {
                 "one": "%(count)ssessão selecionada",
@@ -2309,6 +2946,7 @@
             "sign_in_with_qr": "Vincular novo dispositivo",
             "sign_in_with_qr_button": "Mostrar código QR",
             "sign_in_with_qr_description": "Use um código QR para fazer login em outro dispositivo e configurar mensagens seguras.",
+            "sign_in_with_qr_unsupported": "Não é suportado pelo provedor da sua conta",
             "sign_out": "Sair desta sessão",
             "sign_out_all_other_sessions": "Sair de todas as outras sessões (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
@@ -2348,6 +2986,7 @@
         "show_redaction_placeholder": "Mostrar um marcador para as mensagens removidas",
         "show_stickers_button": "Mostrar o botão de figurinhas",
         "show_typing_notifications": "Mostrar quando alguém estiver digitando",
+        "showbold": "Mostrar todas as atividades na lista de salas (pontos ou número de mensagens não lidas)",
         "sidebar": {
             "dialog_title": "<strong>Configurações:</strong> Barra lateral",
             "metaspaces_favourites_description": "Agrupe todas as suas salas e pessoas favoritas em um só lugar.",
@@ -2358,6 +2997,9 @@
             "metaspaces_orphans_description": "Agrupe todas as suas salas que não fazem parte de um espaço em um só lugar.",
             "metaspaces_people_description": "Agrupe todas as suas pessoas em um só lugar.",
             "metaspaces_subsection": "Espaços para mostrar",
+            "metaspaces_video_rooms": "Salas de vídeo e conferências",
+            "metaspaces_video_rooms_description": "Agrupar todas as salas de vídeo e conferências privadas.",
+            "metaspaces_video_rooms_description_invite_extension": "Nas conferências, você pode convidar pessoas fora da Matrix.",
             "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"
         },
@@ -2395,14 +3037,19 @@
         "warning": "<w>AVISO:</w><description/>"
     },
     "share": {
+        "link_copied": "Link copiado",
         "permalink_message": "Link da mensagem selecionada",
         "permalink_most_recent": "Link da mensagem mais recente",
+        "share_call": "Link de convite para conferência",
+        "share_call_subtitle": "Link para usuários externos participarem da chamada sem uma conta Matrix:",
+        "title_link": "Compartilhar link",
         "title_message": "Compartilhar Mensagem da Sala",
         "title_room": "Compartilhar sala",
         "title_user": "Compartilhar usuário"
     },
     "slash_command": {
         "addwidget": "Adiciona um widget personalizado na sala por meio de um link",
+        "addwidget_iframe_missing_src": "iframe não tem atributo src",
         "addwidget_invalid_protocol": "Forneça o link de um widget com https:// ou http://",
         "addwidget_missing_url": "Forneça o link de um widget ou de um código de incorporação",
         "addwidget_no_permissions": "Você não pode modificar widgets nesta sala.",
@@ -2416,15 +3063,18 @@
         "command_error": "Erro de comando",
         "converttodm": "Converte a sala para uma conversa",
         "converttoroom": "Converte a conversa para uma sala",
+        "could_not_find_room": "Não foi possível encontrar a sala",
         "deop": "Retira o nível de moderador do usuário com o ID informado",
         "devtools": "Abre a caixa de diálogo Ferramentas do desenvolvedor",
         "discardsession": "Força a atual sessão da comunidade em uma sala criptografada a ser descartada",
         "error_invalid_rendering_type": "Erro de comando: Não é possível manipular o tipo (%(renderingType)s)",
+        "error_invalid_room": "O comando falhou: Não foi possível encontrar a sala (%(roomId)s)",
         "error_invalid_runfn": "Erro de comando: Não é possível manipular o comando de barra.",
+        "error_invalid_user_in_room": "Não foi possível encontrar o usuário na sala",
         "help": "Exibe a lista de comandos com usos e descrições",
         "help_dialog_title": "Ajuda com Comandos",
         "holdcall": "Pausa a chamada na sala atual",
-        "html": "Envia uma mensagem como HTML, sem formatação",
+        "html": "Envia uma mensagem como html, sem interpretá-la como markdown",
         "ignore": "Bloqueia um usuário, escondendo as mensagens dele de você",
         "ignore_dialog_description": "Agora você está bloqueando %(userId)s",
         "ignore_dialog_title": "Usuário bloqueado",
@@ -2432,6 +3082,7 @@
         "invite_3pid_needs_is_error": "Use um servidor de identidade para convidar pessoas por e-mail. Gerencie nas Configurações.",
         "invite_3pid_use_default_is_title": "Usar um servidor de identidade",
         "invite_3pid_use_default_is_title_description": "Use um servidor de identidade para convidar por e-mail. Clique em continuar para usar o servidor de identidade padrão (%(defaultIdentityServerName)s) ou gerencie nas Configurações.",
+        "invite_failed": "O usuário (%(user)s) não foi convidado para %(roomId)s, mas o utilitário de convite não apresentou nenhum erro",
         "join": "Entra em uma sala com o endereço fornecido",
         "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.",
@@ -2445,10 +3096,10 @@
         "no_active_call": "Nenhuma chamada ativa nesta sala",
         "op": "Define o nível de permissões de um usuário",
         "part_unknown_alias": "Endereço da sala não reconhecido: %(roomAlias)s",
-        "plain": "Envia uma mensagem de texto sem formatação",
+        "plain": "Envia uma mensagem como texto simples, sem interpretá-la como markdown",
         "query": "Abre um chat com determinada pessoa",
         "query_not_found_phone_number": "Não foi possível encontrar o ID Matrix pelo número de telefone",
-        "rageshake": "Envia um relatório de erro",
+        "rageshake": "Enviar um relatório de bug com logs",
         "rainbow": "Envia a mensagem colorida como arco-íris",
         "rainbowme": "Envia o emoji colorido como um arco-íris",
         "remove": "Remove desta sala o usuário com o ID determinado",
@@ -2462,8 +3113,6 @@
         "topic": "Consulta ou altera a descrição da sala",
         "topic_none": "Esta sala não tem descrição.",
         "topic_room_error": "Falha ao obter tópico da sala: Não foi possível encontrar a sala %(roomId)s",
-        "tovirtual": "Muda para a sala virtual desta sala, se houver uma",
-        "tovirtual_not_found": "Nenhuma sala virtual para esta sala",
         "unban": "Remove o banimento do usuário com o ID indicado",
         "unflip": "Adiciona ┬──┬ ノ( ゜-゜ノ) a uma mensagem de texto simples",
         "unholdcall": "Retoma a chamada na sala atual",
@@ -2478,46 +3127,79 @@
         "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",
+        "view": "Visualizações da sala com o endereço fornecido",
         "whois": "Exibe informação sobre um usuário"
     },
+    "sliding_sync_legacy_no_longer_supported": "A sliding sync antiga não é mais suportada: saia e entre novamente para ativar o novo sinalizador de sliding sync",
     "space": {
         "add_existing_room_space": {
+            "create": "Quer​•​adicionar​•​uma​•​nova​•​sala?",
             "create_prompt": "Criar uma nova sala",
             "dm_heading": "Conversas",
+            "error_heading": "Nem​•​todos​•​os​•​selecionados​•​foram​•​adicionados",
             "progress_text": {
                 "one": "Adicionando sala…",
                 "other": "Adicionando salas… (%(progress)s de %(count)s)"
             },
             "space_dropdown_label": "Seleção de Espaços",
-            "space_dropdown_title": "Adicionar salas existentes"
+            "space_dropdown_title": "Adicionar salas existentes",
+            "subspace_moved_note": "A​•​adição​•​de​•​espaços​•​foi​•​movida."
         },
         "add_existing_subspace": {
             "create_button": "Criar um novo espaço",
+            "create_prompt": "Quer​•​adicionar​•​um​•​novo​•​espaço?",
             "filter_placeholder": "Procure por espaços",
             "space_dropdown_title": "Adicionar espaço existente"
         },
         "context_menu": {
+            "devtools_open_timeline": "Veja​•​o​•​cronograma​•​da​•​sala​•​(devtools)",
             "explore": "Explorar salas",
+            "home": "Espaço​•​doméstico",
+            "manage_and_explore": "Gerencie​•​e​•​explore​•​salas",
             "options": "Opções do espaço"
         },
+        "failed_load_rooms": "Falha​•​ao​•​carregar​•​a​•​lista​•​de​•​salas.",
+        "failed_remove_rooms": "Falha​•​ao​•​remover​•​algumas​•​salas.​•​Tente​•​novamente​•​mais​•​tarde",
+        "incompatible_server_hierarchy": "Seu​•​servidor​•​não​•​suporta​•​a​•​exibição​•​de​•​hierarquias​•​de​•​espaço.",
         "invite": "Convidar pessoas",
         "invite_description": "Convidar com email ou nome de usuário",
         "invite_link": "Compartilhar link de convite",
         "joining_space": "Juntando-se",
         "landing_welcome": "Boas-vindas ao <name/>",
         "leave_dialog_action": "Sair do espaço",
+        "leave_dialog_description": "Você​•​está​•​prestes​•​a​•​deixar​•​<spaceName/>.",
+        "leave_dialog_only_admin_room_warning": "Você​•​é​•​o​•​único​•​administrador​•​de​•​algumas​•​das​•​salas​•​ou​•​espaços​•​que​•​deseja​•​deixar.​•​Deixá-los​•​os​•​deixará​•​sem​•​administradores.",
+        "leave_dialog_only_admin_warning": "Você​•​é​•​o​•​único​•​administrador​•​deste​•​espaço.​•​Sair​•​dele​•​significa​•​que​•​ninguém​•​terá​•​controle​•​sobre​•​ele.",
         "leave_dialog_option_all": "Sair de todas as salas",
+        "leave_dialog_option_intro": "Você​•​gostaria​•​de​•​deixar​•​as​•​salas​•​neste​•​espaço?",
         "leave_dialog_option_none": "Não saia de nenhuma sala",
         "leave_dialog_option_specific": "Sair de algumas salas",
         "leave_dialog_public_rejoin_warning": "Você não poderá entrar novamente a menos que seja convidado novamente.",
+        "leave_dialog_title": "Sair​•de ​%(spaceName)s",
+        "mark_suggested": "Marcar​•​como​•​sugerido",
+        "no_search_result_hint": "Você​•​pode​•​tentar​•​uma​•​pesquisa​•​diferente​•​ou​•​verificar​•​se​•​há​•​erros​•​de​•​digitação.",
+        "preferences": {
+            "sections_section": "Seções​•​para​•​mostrar",
+            "show_people_in_space": "Isso​•​agrupa​•​seus​•​bate-papos​•​com​•​membros​•​desse​•​espaço.​•​Desativar​•​isso​•​ocultará​•​esses​•​bate-papos​•​da​•​sua​•​visão​•​de%(spaceName)s."
+        },
         "room_filter_placeholder": "Buscar salas",
         "search_children": "Pesquisar %(spaceName)s",
         "search_placeholder": "Pesquisar nomes e descrições",
+        "select_room_below": "Selecione​•​uma​•​sala​•​abaixo​•​primeiro",
         "share_public": "Compartilhar o seu espaço público",
-        "unmark_suggested": "Marcar como não sugerido"
+        "suggested": "Sugerido",
+        "suggested_tooltip": "Esta​•​sala​•​é​•​sugerida​•​como​•​uma​•​boa​•​opção​•​para​•​entrar",
+        "title_when_query_available": "Resultados",
+        "title_when_query_unavailable": "Salas​•​e​•​espaços",
+        "unmark_suggested": "Marcar como não sugerido",
+        "user_lacks_permission": "Você​•​não​•​tem​•​permissão"
+    },
+    "space_settings": {
+        "title": "Configurações - %(spaceName)s"
     },
     "spaces": {
         "error_no_permission_add_room": "Você não tem permissão para adicionar salas neste espaço",
+        "error_no_permission_add_space": "Você não tem permissão para adicionar espaços a este espaço",
         "error_no_permission_create_room": "Você não tem permissão para criar novas salas neste espaço",
         "error_no_permission_invite": "Você não tem permissão para convidar pessoas para este espaço"
     },
@@ -2530,26 +3212,41 @@
             "network_dropdown_available_invalid": "Não foi possível encontrar este servidor ou sua lista de salas",
             "network_dropdown_available_invalid_forbidden": "Você não tem a permissão para ver a lista de salas deste servidor",
             "network_dropdown_available_valid": "Muito bem",
+            "network_dropdown_remove_server_adornment": "Remover servidor “%(roomServer)s”",
             "network_dropdown_required_invalid": "Digite um nome de servidor",
+            "network_dropdown_selected_label": "Mostrar: Salas Matrix",
+            "network_dropdown_selected_label_instance": "Mostrar: %(instance)s salas do servidor (%(server)s )",
             "network_dropdown_your_server_description": "Seu servidor"
         }
     },
     "spotlight_dialog": {
+        "cant_find_person_helpful_hint": "Se você não conseguir ver quem está procurando, envie seu link de convite.",
         "cant_find_room_helpful_hint": "Se você não conseguir encontrar a sala que está procurando, peça um convite ou crie uma nova sala.",
+        "copy_link_text": "Copiar link de convite",
         "count_of_members": {
             "one": "%(count)s Membro",
             "other": "%(count)s Membros"
         },
         "create_new_room_button": "Criar nova sala",
+        "failed_querying_public_rooms": "Falha ao consultar salas públicas",
+        "failed_querying_public_spaces": "Falha ao consultar espaços públicos",
+        "group_chat_section_title": "Outras opções",
         "heading_with_query": "Use \"%(query)s\" para pesquisar",
         "heading_without_query": "Pesquisar por",
         "join_button_text": "Junte-se a %(roomAddress)s",
-        "message_search_section_title": "Outras pesquisas",
+        "keyboard_scroll_hint": "Use <arrows/> para rolar",
+        "messages_label": "Mensagens",
+        "other_rooms_in_space": "Outras salas em %(spaceName)s",
         "public_rooms_label": "Salas públicas",
+        "public_spaces_label": "Espaços públicos",
         "recent_searches_section_title": "Pesquisas recentes",
         "recently_viewed_section_title": "Visualizado recentemente",
+        "remove_filter": "Remover filtro de pesquisa para %(filter)s",
+        "result_may_be_hidden_privacy_warning": "Alguns resultados podem estar ocultos por questões de privacidade",
+        "result_may_be_hidden_warning": "Alguns resultados podem estar ocultos",
         "search_dialog": "Diálogo de pesquisa",
-        "search_messages_hint": "Para pesquisar mensagens, procure esse ícone na parte superior de uma sala <icon/>"
+        "spaces_title": "Espaços em que você está",
+        "start_group_chat_button": "Inicie um bate-papo em grupo"
     },
     "stickers": {
         "empty": "No momento, você não tem pacotes de figurinhas ativados",
@@ -2566,14 +3263,15 @@
         "integration_manager": "Use bots, integrações, widgets e pacotes de figurinhas",
         "intro": "Para continuar, você precisa aceitar os termos deste serviço.",
         "summary_identity_server_1": "Encontre outras pessoas por telefone ou e-mail",
-        "summary_identity_server_2": "Seja encontrada/o por número de celular ou por e-mail",
+        "summary_identity_server_2": "Seja encontrado por telefone ou e-mail",
         "tac_button": "Revise os termos e condições",
         "tac_description": "Para continuar usando o servidor local %(homeserverDomain)s, você deve ler e concordar com nossos termos e condições.",
         "tac_title": "Termos e Condições",
         "tos": "Termos de serviço"
     },
     "theme": {
-        "light_high_contrast": "Claro (alto contraste)"
+        "light_high_contrast": "Claro (alto contraste)",
+        "match_system": "Padrão do sistema"
     },
     "thread_view_back_action_label": "Voltar ao tópico",
     "threads": {
@@ -2595,9 +3293,7 @@
     "threads_activity_centre": {
         "header": "Atividade de tópicos",
         "no_rooms_with_threads_notifs": "Você ainda não tem salas com notificações de tópicos.",
-        "no_rooms_with_unread_threads": "Você ainda não tem salas com tópicos não lidos.",
-        "release_announcement_description": "As notificações de tópicos foram movidas, encontre-as aqui a partir de agora.",
-        "release_announcement_header": "Centro de Atividades de Tópicos"
+        "no_rooms_with_unread_threads": "Você ainda não tem salas com tópicos não lidos."
     },
     "time": {
         "about_day_ago": "há aproximadamente um dia",
@@ -2631,7 +3327,12 @@
         "context_menu": {
             "collapse_reply_thread": "Recolher tópico de resposta",
             "external_url": "Link do código-fonte",
-            "resent_unsent_reactions": "Reenviar %(unsentCount)s reações"
+            "open_in_osm": "Abrir no OpenStreetMap",
+            "report": "Denunciar",
+            "resent_unsent_reactions": "Reenviar %(unsentCount)s reações",
+            "show_url_preview": "Mostrar pré-visualização",
+            "view_related_event": "Exibir evento relacionado",
+            "view_source": "Ver fonte"
         },
         "creation_summary_dm": "%(creator)s criou esta conversa.",
         "creation_summary_room": "%(creator)s criou e configurou esta sala.",
@@ -2639,10 +3340,17 @@
             "blocked": "O remetente bloqueou você de receber esta mensagem porque seu dispositivo não foi verificado",
             "historical_event_no_key_backup": "Mensagens históricas não estão disponíveis neste dispositivo",
             "historical_event_unverified_device": "Você precisa verificar este dispositivo para acessar as mensagens históricas",
-            "historical_event_user_not_joined": "Você não tem acesso a esta mensagem"
+            "historical_event_user_not_joined": "Você não tem acesso a esta mensagem",
+            "sender_identity_previously_verified": "A identidade verificada do remetente foi alterada",
+            "sender_unsigned_device": "Enviado de um dispositivo inseguro.",
+            "unable_to_decrypt": "Não foi possível descriptografar a mensagem"
         },
+        "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Decriptando",
         "download_action_downloading": "Baixando",
+        "download_failed": "Falha no download",
+        "download_failed_description": "Ocorreu um erro ao baixar esse arquivo",
+        "e2e_state": "Estado da criptografia de ponta a ponta",
         "edits": {
             "tooltip_label": "Editado em %(date)s. Clique para ver edições.",
             "tooltip_sub": "Clicar para ver edições",
@@ -2651,24 +3359,34 @@
         "error_no_renderer": "Este evento não pôde ser exibido",
         "error_rendering_message": "Não foi possível carregar esta mensagem",
         "historical_messages_unavailable": "Você não pode ver as mensagens anteriores",
+        "in_room_name": " em <strong>%(room)s</strong>",
         "io.element.widgets.layout": "%(senderName)s atualizou o layout da sala",
+        "late_event_separator": "Enviado originalmente em %(dateTime)s",
         "load_error": {
             "no_permission": "Não foi possível carregar um trecho específico da conversa desta sala, porque parece que você não tem permissão para ler a mensagem em questão.",
             "title": "Não foi possível carregar um trecho da conversa",
             "unable_to_find": "Não foi possível carregar um trecho específico da conversa desta sala."
         },
         "m.audio": {
+            "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"
+            "error_processing_voice_message": "Erro ao processar a mensagem de voz",
+            "unnamed_audio": "Áudio sem nome"
+        },
+        "m.beacon_info": {
+            "view_live_location": "Ver localização ao vivo"
         },
         "m.call": {
+            "video_call_ended": "Chamada de vídeo encerrada",
             "video_call_started": "Chamada de vídeo iniciada em %(roomName)s.",
+            "video_call_started_text": "%(name)s iniciou uma chamada de vídeo",
             "video_call_started_unsupported": "Chamada de vídeo iniciada em %(roomName)s. (não compatível com este navegador)"
         },
         "m.call.hangup": {
             "dm": "Chamada encerrada"
         },
         "m.call.invite": {
+            "answered_elsewhere": "Respondido em outro lugar",
             "call_back_prompt": "Chamar de volta",
             "declined": "Chamada recusada",
             "failed_connect_media": "Não foi possível conectar-se à mídia",
@@ -2686,10 +3404,12 @@
         },
         "m.file": {
             "error_decrypting": "Erro ao descriptografar o anexo",
-            "error_invalid": "Arquivo inválido %(extra)s"
+            "error_invalid": "Arquivo inválido"
         },
         "m.image": {
+            "error": "Não é possível mostrar a imagem devido a um erro",
             "error_decrypting": "Erro ao descriptografar a imagem",
+            "error_downloading": "Erro ao baixar a imagem",
             "sent": "%(senderDisplayName)s enviou uma imagem.",
             "show_image": "Mostrar imagem"
         },
@@ -2698,7 +3418,9 @@
             "you_started": "Você enviou uma solicitação de confirmação"
         },
         "m.location": {
-            "full": "%(senderName)s compartilhou sua localização"
+            "full": "%(senderName)s compartilhou sua localização",
+            "location": "Compartilhou um local: ",
+            "self_location": "Compartilhou sua localização: "
         },
         "m.poll": {
             "count_of_votes": {
@@ -2707,6 +3429,7 @@
             }
         },
         "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",
@@ -2733,13 +3456,16 @@
         },
         "m.room.create": {
             "continuation": "Esta sala é uma continuação de outra conversa.",
-            "see_older_messages": "Clique aqui para ver as mensagens mais antigas."
+            "see_older_messages": "Clique aqui para ver as mensagens mais antigas.",
+            "unknown_predecessor": "Não foi possível encontrar a versão antiga desta sala (ID da sala:%(roomId)s) e não recebemos 'via_servers' para procurá-la.",
+            "unknown_predecessor_guess_server": "Não foi possível encontrar a versão antiga desta sala (ID da sala:%(roomId)s) e não recebemos 'via_servers' para procurá-la. É possível que adivinhar o servidor a partir do ID da sala funcione. Se você quiser tentar, clique neste link:"
         },
         "m.room.encryption": {
             "disable_attempt": "A tentativa de desativar a criptografia foi ignorada",
             "disabled": "Criptografia desativada",
             "enabled": "As mensagens nesta sala são criptografadas de ponta a ponta. Quando as pessoas ingressam, você pode verificá-las em seus perfis, basta tocar na foto do perfil.",
             "enabled_dm": "As mensagens aqui são criptografadas de ponta a ponta. Verifique %(displayName)s no perfil deles - toque na foto do perfil.",
+            "enabled_local": "As mensagens neste bate-papo serão criptografadas de ponta a ponta.",
             "parameters_changed": "Alguns parâmetros de criptografia foram modificados.",
             "unsupported": "A criptografia usada nesta sala não é suportada."
         },
@@ -2779,6 +3505,7 @@
             "left_reason": "%(targetName)s saiu da sala: %(reason)s",
             "no_change": "%(senderName)s não fez mudanças",
             "reject_invite": "%(targetName)s rejeitou o convite",
+            "reject_invite_reason": "%(targetName)s rejeitou o convite: %(reason)s",
             "remove_avatar": "%(senderName)s removeu sua foto de perfil",
             "remove_name": "%(senderName)s removeu seu nome de exibição (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s definiu sua foto de perfil",
@@ -2815,11 +3542,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s atualizou esta sala.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s alterou a descrição para \"%(topic)s\"."
+            "changed": "%(senderDisplayName)s alterou a descrição para \"%(topic)s\".",
+            "removed": "%(senderDisplayName)s removeu o tópico."
         },
         "m.sticker": "%(senderDisplayName)s enviou uma figurinha.",
         "m.video": {
-            "error_decrypting": "Erro ao descriptografar o vídeo"
+            "error_decrypting": "Erro ao descriptografar o vídeo",
+            "show_video": "Mostrar vídeo"
         },
         "m.widget": {
             "added": "O widget %(widgetName)s foi criado por %(senderName)s",
@@ -2832,10 +3561,14 @@
             "removed": "O widget %(widgetName)s foi removido por %(senderName)s"
         },
         "mab": {
+            "collapse_reply_chain": "Recolher citações",
             "copy_link_thread": "Copiar ligação para o tópico",
+            "expand_reply_chain": "Expandir citações",
             "label": "Ações da mensagem",
             "view_in_room": "Ver na sala"
         },
+        "message_timestamp_received_at": "Recebido em: %(dateTime)s",
+        "message_timestamp_sent_at": "Enviado em: %(dateTime)s",
         "mjolnir": {
             "changed_rule_glob": "%(senderName)s alterou uma regra que bania o que correspondia a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
             "changed_rule_rooms": "%(senderName)s alterou uma regra que bania salas que correspondiam a %(oldGlob)s para corresponder a %(newGlob)s devido à %(reason)s",
@@ -2856,14 +3589,21 @@
             "updated_rule_servers": "%(senderName)s atualizou a regra que bane servidores que correspondem a %(glob)s devido à %(reason)s",
             "updated_rule_users": "%(senderName)s atualizou a regra de banimento de usuários correspondendo a %(glob)s devido à %(reason)s"
         },
+        "no_permission_messages_before_invite": "Você não tem permissão para ver as mensagens de antes de ser convidado.",
+        "no_permission_messages_before_join": "Você não tem permissão para ver as mensagens de antes de entrar.",
+        "pending_moderation": "Mensagem pendente de moderação",
+        "pending_moderation_reason": "Mensagem pendente de moderação: %(reason)s",
         "reactions": {
             "add_reaction_prompt": "Adicionar reação",
-            "label": "%(reactors)s reagiram com %(content)s"
+            "custom_reaction_fallback_label": "Reação personalizada",
+            "label": "%(reactors)s reagiram com %(content)s",
+            "tooltip_caption": "Reagiu com %(shortName)s"
         },
         "read_receipt_title": {
             "one": "Visto por %(count)s pessoa",
             "other": "Visto por %(count)s pessoas"
         },
+        "read_receipts_label": "Confirmações de leitura",
         "redacted": {
             "tooltip": "Mensagem apagada em %(date)s"
         },
@@ -2925,12 +3665,12 @@
                 "one": "%(severalUsers)s tiveram os convites retirados"
             },
             "invited": {
-                "other": "foi convidada/o %(count)s vezes",
-                "one": "foi convidada/o"
+                "one": "foi convidado",
+                "other": "foi convidado %(count)s vezes"
             },
             "invited_multiple": {
-                "other": "foram convidadas/os %(count)s vezes",
-                "one": "foram convidadas/os"
+                "one": "foram convidados",
+                "other": "foram convidados %(count)s vezes"
             },
             "joined": {
                 "other": "%(oneUser)s entrou %(count)s vezes",
@@ -3030,6 +3770,7 @@
             "one_user": "%(displayName)s está digitando…",
             "two_users": "%(names)s e %(lastPerson)s estão digitando…"
         },
+        "undecryptable_tooltip": "Esta mensagem não pôde ser descriptografada",
         "url_preview": {
             "close": "Fechar a visualização",
             "show_n_more": {
@@ -3041,11 +3782,17 @@
     "truncated_list_n_more": {
         "other": "E %(count)s mais..."
     },
+    "unsupported_browser": {
+        "description": "Se você continuar, alguns recursos podem parar de funcionar e há o risco de você perder dados no futuro. Atualize seu navegador para continuar usando %(brand)s.",
+        "title": "%(brand)s não suporta este navegador"
+    },
     "unsupported_server_description": "Este servidor está usando uma versão mais antiga do Matrix. Atualize para o Matrix %(version)s para usar %(brand)s sem erros.",
     "unsupported_server_title": "Seu servidor não é compatível",
     "update": {
         "changelog": "Registro de alterações",
         "check_action": "Verificar atualizações",
+        "checking": "Verificando se há uma atualização...",
+        "downloading": "Baixando a atualização...",
         "error_encountered": "Erro encontrado (%(errorDetail)s).",
         "error_unable_load_commit": "Não foi possível carregar os detalhes do envio: %(msg)s",
         "new_version_available": "Nova versão disponível. <a>Atualize agora.</a>",
@@ -3056,6 +3803,13 @@
         "toast_title": "Atualizar o %(brand)s",
         "unavailable": "Indisponível"
     },
+    "update_room_access_modal": {
+        "description": "Para criar um link de compartilhamento, torne esta sala <b>pública</b> ou habilite a opção para que os usuários <b>peçam para entrar</b>. Isso permite que os convidados entrem sem serem convidados.",
+        "dont_change_description": "Se não quiser alterar o acesso a essa sala, você pode criar uma nova sala para o link de chamada.",
+        "no_change": "Eu não quero mudar o nível de acesso.",
+        "revert_access_description": "(Isso pode ser revertido para o valor anterior nas configurações da sala: <b>Segurança e privacidade</b> / <b>Acesso</b>)",
+        "title": "Permitir que usuários convidados entrem nesta sala"
+    },
     "upload_failed_generic": "O envio do arquivo '%(fileName)s' falhou.",
     "upload_failed_size": "O arquivo '%(fileName)s' excede o limite de tamanho deste homeserver para uploads",
     "upload_failed_title": "O envio falhou",
@@ -3065,6 +3819,7 @@
         "error_files_too_large": "Esses arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
         "error_some_files_too_large": "Alguns arquivos são <b>muito grandes</b> para serem enviados. O limite do tamanho de arquivos é %(limit)s.",
         "error_title": "Erro no envio",
+        "not_image": "O arquivo que você escolheu não é um arquivo de imagem válido.",
         "title": "Enviar arquivos",
         "title_progress": "Enviar arquivos (%(current)s de %(total)s)",
         "upload_all_button": "Enviar tudo",
@@ -3075,6 +3830,8 @@
     },
     "user_info": {
         "admin_tools_section": "Ferramentas de administração",
+        "ban_button_room": "Banir da sala",
+        "ban_button_space": "Banir do espaço",
         "ban_room_confirm_title": "Banir de %(roomName)s",
         "ban_space_everything": "Bani-los de tudo que eu faço",
         "ban_space_specific": "Bani-los de coisas específicas que faço",
@@ -3085,14 +3842,25 @@
         "demote_self_confirm_description_space": "Você não poderá desfazer esta mudança, já que está tirando seu próprio cargo, e se você for o último usuário com privilégios neste espaço será impossível ganhá-los novamente.",
         "demote_self_confirm_room": "Você não poderá desfazer essa alteração, já que está rebaixando sua própria permissão. Se você for a última pessoa nesta sala, será impossível recuperar a permissão atual.",
         "demote_self_confirm_title": "Reduzir seu próprio privilégio?",
+        "disinvite_button_room": "Desconvidar da sala",
         "disinvite_button_room_name": "Cancelar convite de %(roomName)s",
+        "disinvite_button_space": "Desconvidar do espaço",
         "error_ban_user": "Não foi possível banir o usuário",
         "error_deactivate": "Falha ao desativar o usuário",
-        "error_mute_user": "Não foi possível remover notificações da/do usuária/o",
+        "error_kicking_user": "Falha ao remover usuário",
+        "error_mute_user": "Falha ao silenciar o usuário",
         "error_revoke_3pid_invite_description": "Não foi possível revogar o convite. O servidor pode estar com um problema temporário ou você não tem permissões suficientes para revogar o convite.",
         "error_revoke_3pid_invite_title": "Falha ao revogar o convite",
+        "ignore_button": "Ignorar",
+        "ignore_confirm_description": "Todas as mensagens e convites desse usuário serão ocultados. Você tem certeza de que deseja ignorá-lo?",
+        "ignore_confirm_title": "Ignorar %(user)s",
         "invited_by": "Convidado por %(sender)s",
         "jump_to_rr_button": "Ir para a confirmação de leitura",
+        "kick_button_room": "Remover da sala",
+        "kick_button_room_name": "Remover de %(roomName)s",
+        "kick_button_space": "Remover do espaço",
+        "kick_button_space_everything": "Remova-os de tudo que eu puder",
+        "kick_space_specific": "Remover de coisas específicas que eu posso fazer",
         "kick_space_warning": "Eles ainda poderão acessar tudo o que você não for administrador.",
         "promote_warning": "Você não poderá desfazer essa alteração, pois está promovendo o usuário ao mesmo nível de permissão que você.",
         "redact": {
@@ -3100,7 +3868,13 @@
                 "other": "Apagar %(count)s mensagens para todos",
                 "one": "Remover 1 mensagem"
             },
+            "confirm_description_1": {
+                "one": "Você está prestes a remover a %(count)s mensagem de %(user)s. Isso os removerá permanentemente para todos na conversa. Você deseja continuar?",
+                "other": "Você está prestes a remover %(count)s mensagens de %(user)s. Isso os removerá permanentemente para todos na conversa. Você deseja continuar?"
+            },
             "confirm_description_2": "Quando há muitas mensagens, isso pode levar algum tempo. Por favor, não recarregue o seu cliente enquanto isso.",
+            "confirm_keep_state_explainer": "Desmarque se você também deseja remover as mensagens do sistema desse usuário (por exemplo, alteração de associação, alteração de perfil...)",
+            "confirm_keep_state_label": "Preservar as mensagens do sistema",
             "confirm_title": "Apagar mensagens de %(user)s na sala",
             "no_recent_messages_description": "Tente rolar para cima na conversa para ver se há mensagens anteriores.",
             "no_recent_messages_title": "Nenhuma mensagem recente de %(user)s foi encontrada"
@@ -3113,14 +3887,19 @@
         "room_unencrypted_detail": "Em salas criptografadas, suas mensagens estão seguras e apenas você e a pessoa que a recebe têm as chaves únicas que permitem a sua leitura.",
         "send_message": "Enviar mensagem",
         "share_button": "Compartilhar perfil",
+        "unban_button_room": "Desbanir da sala",
+        "unban_button_space": "Desbanir do espaço",
         "unban_room_confirm_title": "Desbanir de %(roomName)s",
         "unban_space_everything": "Desbani-los de tudo que eu faço",
         "unban_space_specific": "Desbani-los de coisas específicas que eu faço",
         "unban_space_warning": "Eles não poderão acessar o que você não é administrador.",
+        "unignore_button": "Designorar",
+        "verification_unavailable": "Verificação de usuário indisponível",
         "verify_button": "Confirmar usuário",
         "verify_explainer": "Para maior segurança, confirme este usuário comparando um código único em ambos os aparelhos."
     },
     "user_menu": {
+        "link_new_device": "Vincular novo dispositivo",
         "settings": "Todas as configurações",
         "switch_theme_dark": "Alternar para o modo escuro",
         "switch_theme_light": "Alternar para o modo claro"
@@ -3144,6 +3923,7 @@
         "camera_disabled": "Sua câmera está desligada",
         "camera_enabled": "Sua câmera ainda está habilitada",
         "cannot_call_yourself_description": "Você não pode iniciar uma chamada consigo mesmo.",
+        "close_lobby": "Fechar lobby",
         "connecting": "Conectando",
         "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.",
@@ -3157,14 +3937,23 @@
         "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",
+        "element_call": "Element",
         "enable_camera": "Ligar câmera",
         "enable_microphone": "Habilitar microfone",
         "expand": "Retornar para a chamada",
+        "get_call_link": "Compartilhar link de chamada",
         "hangup": "Desligar",
         "hide_sidebar_button": "Esconder a barra lateral",
         "input_devices": "Dispositivos de entrada",
+        "jitsi_call": "Jitsi",
         "join_button_tooltip_call_full": "Desculpe, esta chamada está lotada no momento",
+        "legacy_call": "Legacy",
         "maximise": "Preencher tela",
+        "maximise_call": "Maximizar chamada",
+        "metaspace_video_rooms": {
+            "conference_room_section": "Conferências"
+        },
+        "minimise_call": "Minimizar chamada",
         "misconfigured_server": "A chamada falhou por conta de má configuração no servidor",
         "misconfigured_server_description": "Por favor, peça ao administrador do seu servidor (<code>%(homeserverDomain)s</code>) para configurar um servidor TURN, de modo que as chamadas funcionem de maneira estável.",
         "misconfigured_server_fallback": "Como alternativa, você pode tentar usar o servidor público em<server/>, mas isso não será tão confiável e ele compartilhará seu endereço IP com esse servidor. Você também pode gerenciar isso em Configurações.",
@@ -3212,6 +4001,7 @@
         "user_is_presenting": "%(sharerName)s está apresentando",
         "video_call": "Chamada de vídeo",
         "video_call_started": "Videochamada iniciada",
+        "video_call_using": "Chamada de vídeo usando:",
         "voice_call": "Chamada de voz",
         "you_are_presenting": "Você está apresentando"
     },
@@ -3311,7 +4101,7 @@
         "error_need_to_be_logged_in": "Você precisa estar logado.",
         "error_unable_start_audio_stream_description": "Não foi possível iniciar a transmissão de áudio.",
         "error_unable_start_audio_stream_title": "Falha ao iniciar a transmissão ao vivo",
-        "modal_data_warning": "Dados nessa tela são compartilhados com %(widgetDomain)s",
+        "modal_data_warning": "Os dados abaixo são compartilhados com %(widgetDomain)s",
         "modal_title_default": "Popup do widget",
         "no_name": "App desconhecido",
         "open_id_permissions_dialog": {
@@ -3346,6 +4136,7 @@
             "l33t": "Substituições previsíveis como '@' em vez de 'a' não ajudam muito",
             "longerKeyboardPattern": "Use um padrão de teclas em diferentes direções e sentido",
             "noNeed": "Não há necessidade de símbolos, dígitos ou letras maiúsculas",
+            "pwned": "Se​•​você​•​usar​•​essa​•​senha​•​em​•​outro​•​lugar,​•​deverá​•​alterá-la.",
             "recentYears": "Evite anos recentes",
             "repeated": "Evite palavras e caracteres repetidos",
             "reverseWords": "Palavras invertidas não são muito mais difíceis de adivinhar",
@@ -3359,6 +4150,7 @@
             "extendedRepeat": "Repetições como \"abcabcabc\" são apenas um pouco mais difíceis de adivinhar que \"abc\"",
             "keyPattern": "Padrões de teclado curtos são fáceis de adivinhar",
             "namesByThemselves": "Nomes e sobrenomes por si só são fáceis de adivinhar",
+            "pwned": "Sua​•​senha​•​foi​•​exposta​•​por​•​uma​•​violação​•​de​•​dados​•​na​•​Internet.",
             "recentYears": "Os últimos anos são fáceis de adivinhar",
             "sequences": "Sequências como abc ou 6543 são fáceis de adivinhar",
             "similarToCommon": "Isto é similar a uma senha muito comum",
@@ -3366,6 +4158,7 @@
             "straightRow": "Linhas retas de teclas são fáceis de adivinhar",
             "topHundred": "Esta é uma das top-100 senhas mais comuns",
             "topTen": "Esta é uma das top-10 senhas mais comuns",
+            "userInputs": "Não deve haver nenhum dado pessoal ou relacionado à página.",
             "wordByItself": "Uma palavra por si só é fácil de adivinhar"
         }
     }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 79fbf98051..eb960a6b41 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1,6 +1,8 @@
 {
     "a11y": {
+        "emoji_picker": "Выбор эмодзи",
         "jump_first_invite": "Перейти к первому приглашению.",
+        "message_composer": "Автор сообщения",
         "n_unread_messages": {
             "other": "%(count)s непрочитанных сообщения(-й).",
             "one": "1 непрочитанное сообщение."
@@ -9,7 +11,10 @@
             "other": "%(count)s непрочитанных сообщения(-й), включая упоминания.",
             "one": "1 непрочитанное упоминание."
         },
+        "recent_rooms": "Недавние комнаты",
         "room_name": "Комната %(name)s",
+        "room_status_bar": "Строка состояния комнаты",
+        "seek_bar_label": "Панель поиска аудио",
         "unread_messages": "Непрочитанные сообщения.",
         "user_menu": "Меню пользователя"
     },
@@ -40,6 +45,8 @@
         "create_a_room": "Создать комнату",
         "create_account": "Создать учётную запись",
         "decline": "Отклонить",
+        "decline_and_block": "Отклонить и заблокировать",
+        "decline_invite": "Отклонить приглашение",
         "delete": "Удалить",
         "deny": "Запретить",
         "disable": "Отключить",
@@ -59,6 +66,7 @@
         "go": "Вперёд",
         "go_back": "Назад",
         "got_it": "Понятно",
+        "hide": "Скрыть",
         "hide_advanced": "Скрыть дополнительные настройки",
         "hold": "Удерживать",
         "ignore": "Игнорировать",
@@ -75,12 +83,14 @@
         "maximise": "Развернуть",
         "mention": "Упомянуть",
         "minimise": "Свернуть",
+        "new_message": "Новое сообщение",
         "new_room": "Новая комната",
         "new_video_room": "Новая видеокомната",
         "next": "Далее",
         "no": "Нет",
         "ok": "ОК",
         "open": "Открыть",
+        "open_menu": "Открыть меню",
         "pause": "Пауза",
         "pin": "Закрепить",
         "play": "Воспроизведение",
@@ -89,13 +99,13 @@
         "react": "Отреагировать",
         "refresh": "Обновить",
         "register": "Зарегистрироваться",
-        "reject": "Отклонить",
         "reload": "Обновить",
         "remove": "Удалить",
         "rename": "Переименовать",
         "reply": "Ответить",
         "reply_in_thread": "Обсудить",
         "report_content": "Пожаловаться на сообщение",
+        "report_room": "Комната отчетов",
         "resend": "Переотправить",
         "reset": "Сброс",
         "resume": "Возобновить",
@@ -105,6 +115,7 @@
         "save": "Сохранить",
         "search": "Поиск",
         "send_report": "Отослать отчёт",
+        "set_avatar": "Установить изображение профиля",
         "share": "Поделиться",
         "show": "Показать",
         "show_advanced": "Показать дополнительные настройки",
@@ -114,7 +125,7 @@
         "skip": "Пропустить",
         "start": "Начать",
         "start_chat": "Отправить личное сообщение",
-        "start_new_chat": "Начать ЛС",
+        "start_new_chat": "Начать новый чат",
         "stop": "Стоп",
         "submit": "Отправить",
         "subscribe": "Подписаться",
@@ -128,6 +139,7 @@
         "update": "Обновить",
         "upgrade": "Обновление",
         "upload": "Загрузить",
+        "upload_file": "Загрузить файл",
         "verify": "Заверить",
         "view": "Просмотр",
         "view_all": "Посмотреть все",
@@ -135,6 +147,7 @@
         "view_message": "Посмотреть сообщение",
         "view_source": "Исходный код",
         "yes": "Да",
+        "yes_dismiss": "Да, отклонить",
         "zoom_in": "Увеличить",
         "zoom_out": "Уменьшить"
     },
@@ -185,7 +198,7 @@
         "continue_with_sso": "Продолжить с %(ssoButtons)s",
         "country_dropdown": "Выпадающий список стран",
         "create_account_prompt": "Впервые здесь? <a>Создать учётную запись</a>",
-        "create_account_title": "Создать учётную запись",
+        "create_account_title": "Создать учетную запись",
         "email_discovery_text": "Если вы хотите, чтобы другие пользователи могли вас найти, укажите свой адрес электронной почты.",
         "email_field_label": "Электронная почта",
         "email_field_label_invalid": "Не похоже на действительный адрес электронной почты",
@@ -222,6 +235,7 @@
         },
         "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": "Этот номер телефона неправильный, проверьте его и повторите попытку",
@@ -239,11 +253,40 @@
         "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_unexpected": "Произошла неожиданная ошибка.",
-            "scan_code_instruction": "Отсканируйте приведенный ниже QR-код на устройстве, которое вышло из системы.",
-            "scan_qr_code": "Сканировать QR-код",
-            "select_qr_code": "Выберите '%(scanQRCode)s'",
+            "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 или используйте мобильный интернет",
+            "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": "Создать учётную запись",
@@ -332,6 +375,9 @@
             "email_resend_prompt": "Не получили? <a>Отправить его повторно</a>",
             "email_resent": "Отправлено повторно!",
             "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": "Введите полученный код:",
@@ -366,6 +412,15 @@
         "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>.",
@@ -405,6 +460,7 @@
         "access_token": "Токен доступа",
         "accessibility": "Доступность",
         "advanced": "Подробности",
+        "all_chats": "Все чаты",
         "analytics": "Аналитика",
         "and_n_others": {
             "other": "и %(count)s других...",
@@ -419,10 +475,10 @@
         "beta": "Бета",
         "camera": "Камера",
         "cameras": "Камеры",
+        "cancel": "Отменить",
         "capabilities": "Возможности",
         "copied": "Скопировано!",
         "credits": "Благодарности",
-        "cross_signing": "Кросс-подпись",
         "dark": "Темная",
         "description": "Описание",
         "deselect_all": "Отменить выбор",
@@ -458,13 +514,16 @@
         "matrix": "Matrix",
         "message": "Отправить личное сообщение",
         "message_layout": "Макет сообщения",
+        "message_timestamp_invalid": "Недопустимая метка времени",
         "microphone": "Микрофон",
         "model": "Модель",
-        "modern": "Новый",
+        "moderation_and_safety": "Модерация и безопасность",
+        "modern": "Современный",
         "mute": "Приглушить",
         "n_members": {
             "one": "%(count)s участник",
-            "other": "%(count)s участников"
+            "few": "%(count)s участника",
+            "many": "%(count)s участников"
         },
         "n_rooms": {
             "one": "%(count)s комната",
@@ -495,10 +554,13 @@
         "qr_code": "QR-код",
         "random": "Случайный",
         "reactions": "Реакции",
+        "recommended": "Рекомендуемое",
         "report_a_bug": "Сообщить об ошибке",
         "room": "Комната",
         "room_name": "Название комнаты",
         "rooms": "Комнаты",
+        "save": "Сохранить",
+        "saved": "Сохранено",
         "saving": "Сохранение…",
         "secure_backup": "Безопасное резервное копирование",
         "select_all": "Выбрать все",
@@ -509,8 +571,8 @@
         "someone": "Кто-то",
         "space": "Подпространство",
         "spaces": "Пространства",
-        "sticker": "Наклейка",
-        "stickerpack": "Наклейки",
+        "sticker": "Стикер",
+        "stickerpack": "Набор стикеров",
         "success": "Успех",
         "suggestions": "Предложения",
         "support": "Поддержка",
@@ -525,9 +587,10 @@
         "unnamed_room": "Комната без названия",
         "unnamed_space": "Безымянное пространство",
         "unverified": "Не заверено",
+        "updating": "Обновление…",
         "user": "Пользователь",
         "user_avatar": "Аватар",
-        "username": "Псевдоним",
+        "username": "Имя пользователя",
         "verification_cancelled": "Подтверждение отменено",
         "verified": "Заверено",
         "version": "Версия",
@@ -549,7 +612,7 @@
             "user_a11y": "Автозаполнение пользователя",
             "user_description": "Пользователи"
         },
-        "close_sticker_picker": "Скрыть наклейки",
+        "close_sticker_picker": "Скрыть стикеры",
         "edit_composer_label": "Редактировать сообщение",
         "format_bold": "Жирный",
         "format_code_block": "Блок кода",
@@ -640,7 +703,7 @@
         "invite_teammates_by_username": "Пригласить по имени пользователя",
         "invite_teammates_description": "Убедитесь, что правильные люди имеют доступ. Вы можете пригласить больше людей позже.",
         "invite_teammates_heading": "Пригласите своих товарищей по команде",
-        "inviting_users": "Приглашение...",
+        "inviting_users": "Приглашение…",
         "label": "Создать пространство",
         "name_required": "Пожалуйста, введите название пространства",
         "personal_space": "Только я",
@@ -677,6 +740,12 @@
         "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\"?",
+        "reason_description": "Опишите причину сообщения о проблеме.",
+        "report_room_description": "Сообщите об этой комнате своему поставщику учетной записи.",
+        "title": "Отклонить приглашение"
+    },
     "desktop_default_device_name": "%(brand)s Рабочий стол: %(platformName)s",
     "devtools": {
         "active_widgets": "Активные виджеты",
@@ -684,6 +753,43 @@
         "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_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": "Криптографический модуль недоступен",
+            "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": "Самоподписанный закрытый ключ:",
+            "title": "Сквозное шифрование",
+            "user_signing_private_key_cached_status": "Закрытый ключ подписи пользователей:"
+        },
         "developer_mode": "Режим разработчика",
         "developer_tools": "Инструменты разработчика",
         "edit_setting": "Изменить настройки",
@@ -723,9 +829,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": "Посмотреть историю",
@@ -740,6 +846,9 @@
         "setting_colon": "Настройки:",
         "setting_definition": "Установка определения:",
         "setting_id": "ID настроек",
+        "settings": {
+            "elementCallUrl": "URL-адрес Element Call"
+        },
         "settings_explorer": "Посмотреть настройки",
         "show_hidden_events": "Показывать скрытые события в ленте сообщений",
         "spaces": {
@@ -749,7 +858,7 @@
         },
         "state_key": "Ключ состояния",
         "thread_root_id": "Идентификатор Root ID: %(threadRootId)s",
-        "threads_timeline": "Хронология тем",
+        "threads_timeline": "Хронология обсуждений",
         "title": "Инструменты разработчика",
         "toggle_event": "переключить событие",
         "toolbox": "Панель инструментов",
@@ -793,52 +902,37 @@
     "empty_room_was_name": "Пустая комната (без %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Введите свою секретную фразу или <button> используйте секретный ключ </button> для продолжения.",
+            "alternatives": "Если у вас есть ключ безопасности или защитная фраза, это тоже подойдет.",
             "key_validation_text": {
-                "invalid_security_key": "Неверный ключ безопасности",
-                "recovery_key_is_correct": "Выглядит неплохо!",
-                "wrong_file_type": "Неправильный тип файла",
-                "wrong_security_key": "Неправильный ключ безопасности"
+                "wrong_security_key": "Введенный ключ восстановления неверен."
             },
-            "reset_title": "Сбросить всё",
-            "reset_warning_1": "Делайте это только в том случае, если у вас нет другого устройства для завершения проверки.",
-            "reset_warning_2": "Если вы сбросите все настройки, вы перезагрузитесь без доверенных сеансов, без доверенных пользователей, и скорее всего не сможете просматривать прошлые сообщения.",
+            "privacy_warning": "Убедитесь, что никто не видит этот экран!",
             "restoring": "Восстановление ключей из резервной копии",
-            "security_key_title": "Бумажный ключ",
-            "security_phrase_incorrect_error": "Невозможно получить доступ к секретному хранилищу. Убедитесь, что вы ввели правильную секретную фразу.",
-            "security_phrase_title": "Мнемоническая фраза",
-            "separator": "%(securityKey)s или %(recoveryFile)s",
-            "use_security_key_prompt": "Чтобы продолжить, используйте свой бумажный ключ."
+            "security_key_title": "Ключ восстановления"
         },
         "bootstrap_title": "Настройка ключей",
         "cancel_entering_passphrase_description": "Вы уверены, что хотите отменить ввод кодовой фразы?",
         "cancel_entering_passphrase_title": "Отменить ввод кодовой фразы?",
         "confirm_encryption_setup_body": "Нажмите кнопку ниже, чтобы подтвердить настройку шифрования.",
         "confirm_encryption_setup_title": "Подтвердите настройку шифрования",
-        "cross_signing_not_ready": "Кросс-подпись не настроена.",
-        "cross_signing_ready": "Кросс-подпись готова к использованию.",
-        "cross_signing_ready_no_backup": "Кросс-подпись готова, но ключи не резервируются.",
         "cross_signing_room_normal": "Эта комната зашифрована сквозным шифрованием",
         "cross_signing_room_verified": "Все в этой комнате подтверждены",
         "cross_signing_room_warning": "Кто-то использует неизвестный сеанс",
-        "cross_signing_unsupported": "Ваш домашний сервер не поддерживает кросс-подписи.",
-        "cross_signing_untrusted": "У вашей учётной записи есть кросс-подпись в секретное хранилище, но она пока не является доверенной в этом сеансе.",
         "cross_signing_user_normal": "Вы не подтвердили этого пользователя.",
         "cross_signing_user_verified": "Вы подтвердили этого пользователя. Пользователь подтвердил все свои сеансы.",
         "cross_signing_user_warning": "Этот пользователь не подтвердил все свои сеансы.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Очистить ключи кросс-подписи",
-            "title": "Уничтожить ключи кросс-подписи?",
-            "warning": "Удаление ключей кросс-подписи является мгновенным и необратимым действием. Любой, с кем вы прошли проверку, увидит предупреждения безопасности. Вы почти наверняка не захотите этого делать, если только не потеряете все устройства, с которых можно совершать кросс-подпись."
-        },
+        "enter_recovery_key": "Введите ключ восстановления",
         "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": "Ваш браузер не поддерживает необходимые криптографические расширения",
+        "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": "Домашний сервер пользователя, которого вы подтверждаете",
@@ -853,7 +947,8 @@
             "title": "Новый метод восстановления",
             "warning": "Если вы не задали новый способ восстановления, злоумышленник может получить доступ к вашей учётной записи. Смените пароль учётной записи и сразу же задайте новый способ восстановления в настройках."
         },
-        "not_supported": "<не поддерживается>",
+        "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": "Если вы сделали это по ошибке, вы можете настроить защищённые сообщения в этом сеансе, что снова зашифрует историю сообщений в этом сеансе с помощью нового метода восстановления.",
@@ -861,11 +956,13 @@
             "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": "Перед выходом сохраните резервную копию ключей шифрования, чтобы не потерять их.",
-            "title": "Настроить"
+            "explainer": "Перед выходом сохраните резервную копию ключей шифрования, чтобы не потерять их."
         },
         "udd": {
             "interactive_verification_button": "Интерактивная сверка по смайлам",
@@ -880,7 +977,6 @@
             "accepting": "Принятие…",
             "after_new_login": {
                 "device_verified": "Сеанс заверен",
-                "reset_confirmation": "Действительно сбросить ключи подтверждения?",
                 "skip_verification": "Пока пропустить проверку",
                 "unable_to_verify": "Невозможно заверить этот сеанс",
                 "verify_this_device": "Заверьте этот сеанс"
@@ -902,7 +998,7 @@
             "incoming_sas_dialog_waiting": "Ожидаем подтверждения от партнера…",
             "incoming_sas_user_dialog_text_1": "Проверить этого пользователя, чтобы отметить его, как доверенного. Доверенные пользователи дают вам больше уверенности при использовании шифрованных сообщений.",
             "incoming_sas_user_dialog_text_2": "Подтверждение этого пользователя сделает его сеанс доверенным у вас, а также сделает ваш сеанс доверенным у него.",
-            "no_key_or_device": "Похоже, у вас нет бумажного ключа, или других сеансов, с которыми вы могли бы свериться.  В этом сеансе вы не сможете получить доступ к старым зашифрованным сообщениям. Чтобы подтвердить свою личность в этом сеансе, вам нужно будет сбросить свои ключи шифрования.",
+            "no_key_or_device": "Похоже, у вас нет Ключа Восстановления, или других сеансов, с которыми вы могли бы свериться.  В этом сеансе вы не сможете получить доступ к старым зашифрованным сообщениям. Чтобы подтвердить свою личность в этом сеансе, вам нужно будет сбросить свои ключи шифрования.",
             "no_support_qr_emoji": "Устройство, которое вы пытаетесь проверить, не поддерживает сканирование QR-кода или проверку смайликов, которые поддерживает %(brand)s. Попробуйте использовать другой клиент.",
             "other_party_cancelled": "Другая сторона отменила проверку.",
             "prompt_encrypted": "Подтвердите всех пользователей в комнате, чтобы обеспечить безопасность.",
@@ -912,9 +1008,10 @@
             "qr_or_sas": "%(qrCode)s или %(emojiCompare)s",
             "qr_or_sas_header": "Заверьте этот сеанс, выполнив одно из следующих действий:",
             "qr_prompt": "Отсканируйте этот уникальный код",
-            "qr_reciprocate_same_shield_device": "Почти готово! Ваше другое устройство показывает такой же щит?",
+            "qr_reciprocate_same_shield_device": "Почти готово! На другом устройстве отображается такой же щит?",
             "qr_reciprocate_same_shield_user": "Почти готово! Отображает ли %(displayName)s такой же щит?",
             "request_toast_accept": "Проверка сеанса",
+            "request_toast_accept_user": "Подтвердить пользователя",
             "request_toast_decline_counter": "Игнорировать (%(counter)s)",
             "request_toast_detail": "%(deviceId)s с %(ip)s",
             "reset_proceed_prompt": "Выполнить сброс",
@@ -950,11 +1047,9 @@
             "verify_emoji_prompt": "Подтверждение сравнением уникальных смайлов.",
             "verify_emoji_prompt_qr": "Если вы не можете отсканировать код выше, попробуйте сравнить уникальные смайлы.",
             "verify_later": "Я заверю позже",
-            "verify_reset_warning_1": "Сброс ключей проверки нельзя отменить. После сброса вы не сможете получить доступ к старым зашифрованным сообщениям, а друзья, которые ранее проверили вас, будут видеть предупреждения о безопасности, пока вы не пройдете повторную проверку.",
-            "verify_reset_warning_2": "Продолжайте, только если вы уверены, что потеряли все остальные устройства и ключ безопасности.",
             "verify_using_device": "Сверить с другим сеансом",
-            "verify_using_key": "Заверить бумажным ключом",
-            "verify_using_key_or_phrase": "Проверка с помощью ключа безопасности или фразы",
+            "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,6 +1100,10 @@
     },
     "error_app_open_in_another_tab": "%(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": "База данных неожиданно закрылась",
     "error_dialog": {
         "copy_room_link_failed": {
@@ -1012,11 +1111,7 @@
             "title": "Не удалось скопировать ссылку на комнату"
         },
         "error_loading_user_profile": "Не удалось загрузить профиль пользователя",
-        "forget_room_failed": "Не удалось забыть комнату: %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Сервер может быть недоступен, перегружен или поиск прекращен по тайм-ауту :(",
-            "title": "Поиск не удался"
-        }
+        "forget_room_failed": "Не удалось забыть комнату: %(errCode)s"
     },
     "error_user_not_logged_in": "Пользователь не вошел в систему",
     "event_preview": {
@@ -1041,7 +1136,14 @@
             "you": "Вы отреагировали %(reaction)s на %(message)s"
         },
         "m.sticker": "%(senderName)s: %(stickerName)s",
-        "m.text": "%(senderName)s: %(message)s"
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "Аудио",
+            "file": "Файл",
+            "image": "Изображение",
+            "poll": "Опрос",
+            "video": "Видео"
+        }
     },
     "export_chat": {
         "cancelled": "Экспорт отменён",
@@ -1112,7 +1214,7 @@
         "platform_username": "Ваша платформа и имя пользователя будут отмечены, чтобы мы могли максимально использовать ваш отзыв.",
         "pro_type": "СОВЕТ ДЛЯ ПРОФЕССИОНАЛОВ: если вы запустите ошибку, отправьте <debugLogsLink>журналы отладки</debugLogsLink>, чтобы помочь нам отследить проблему.",
         "send_feedback_action": "Отправить отзыв",
-        "sent": "Отзыв отправлен"
+        "sent": "Отзыв отправлен! Спасибо, мы очень благодарны!"
     },
     "file_panel": {
         "empty_description": "Прикрепите файлы из чата или просто перетащите их в комнату.",
@@ -1133,6 +1235,7 @@
         "change": "Изменить сервер идентификации",
         "change_prompt": "Отключиться от сервера идентификации <current /> и вместо этого подключиться к <new />?",
         "change_server_prompt": "Если вы не хотите использовать <server /> для обнаружения вас и быть обнаруженным вашими существующими контактами, введите другой идентификационный сервер ниже.",
+        "changed": "Ваш сервер идентификации изменен",
         "checking": "Проверка сервера",
         "description_connected": "В настоящее время вы используете <server></server> для поиска вами ваших контактов а также вас вашими оппонентами. Вы можете изменить ваш сервер идентификации ниже.",
         "description_disconnected": "Вы в настоящее время не используете сервер идентификации. Чтобы найти известные вам контакты, и чтобы они могли найти вас, укажите сервер ниже.",
@@ -1164,7 +1267,16 @@
         "other": "В %(spaceName)s и %(count)s других пространствах."
     },
     "incompatible_browser": {
-        "title": "Неподдерживаемый браузер"
+        "continue": "Продолжить в любом случае",
+        "detail_no_continue": "Попробуйте обновить этот браузер, если вы используете не последнюю версию, и повторите попытку.",
+        "learn_more": "Подробнее",
+        "linux": "Linux",
+        "macos": "Mac",
+        "title": "Неподдерживаемый браузер",
+        "use_desktop_heading": "Вместо этого используйте %(brand)s Desktop",
+        "use_mobile_heading_after_desktop": "Или воспользуйтесь нашим мобильным приложением",
+        "windows_64bit": "Windows (64-бит)",
+        "windows_arm_64bit": "Windows (ARM 64-бит)"
     },
     "info_tooltip_title": "Информация",
     "integration_manager": {
@@ -1173,6 +1285,7 @@
         "error_connecting_heading": "Не удалось подключиться к менеджеру интеграций",
         "explainer": "Менеджеры по интеграции получают данные конфигурации и могут изменять виджеты, отправлять приглашения в комнаты и устанавливать уровни доступа от вашего имени.",
         "manage_title": "Управление интеграциями",
+        "toggle_label": "Включить менеджер интеграции",
         "use_im": "Используйте менеджер интеграций для управления ботами, виджетами и наклейками.",
         "use_im_default": "Используйте менеджер интеграций <b>%(serverName)s</b> для управления ботами, виджетами и наклейками."
     },
@@ -1289,12 +1402,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": "Свернуть секцию списка комнат",
@@ -1305,7 +1420,7 @@
         "scroll_down_timeline": "Листать ленту сообщений вниз",
         "scroll_up_timeline": "Листать временную шкалу вверх",
         "search": "Поиск (должен быть включен)",
-        "send_sticker": "Отправить наклейку",
+        "send_sticker": "Отправить стикер",
         "shift": "Shift",
         "space": "Подпространство",
         "switch_to_space": "Перейти к пространству по номеру",
@@ -1339,8 +1454,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": "Разработка",
@@ -1352,6 +1471,8 @@
         "group_rooms": "Комнаты",
         "group_spaces": "Пространства",
         "group_themes": "Темы",
+        "group_threads": "Обсуждения",
+        "group_ui": "Пользовательский интерфейс",
         "group_voip": "Голос и видео",
         "group_widgets": "Виджеты",
         "hidebold": "Скрыть точку уведомления (отображать только значки счетчиков)",
@@ -1367,10 +1488,12 @@
         "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": "Пожаловаться модераторам",
@@ -1378,7 +1501,7 @@
         "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": "Видеокомнаты",
@@ -1430,6 +1553,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": "Это пространство не публично. Вы не сможете вновь войти без приглашения."
     },
@@ -1487,12 +1612,20 @@
         "toggle_attribution": "Переключить атрибуцию"
     },
     "member_list": {
+        "count": {
+            "one": "%(count)s Участник",
+            "few": "%(count)s Участника",
+            "many": "%(count)s Участников"
+        },
         "filter_placeholder": "Поиск по участникам",
         "invite_button_no_perms_tooltip": "У вас нет разрешения приглашать пользователей",
+        "invited_label": "Приглашены",
+        "no_matches": "Нет совпадений",
         "power_label": "%(userName)s (уровень прав %(powerLevelNumber)s)"
     },
     "member_list_back_action_label": "Участники комнаты",
     "message_edit_dialog_title": "Правки сообщения",
+    "migrating_crypto": "Наберитесь терпения. Мы обновляем %(brand)s, чтобы сделать шифрование быстрые и надежнее.",
     "mobile_guide": {
         "toast_accept": "Использовать приложение",
         "toast_description": "%(brand)s работает в экспериментальном режиме в мобильном браузере. Для лучших впечатлений и новейших функций используйте наше родное бесплатное приложение.",
@@ -1517,6 +1650,12 @@
         "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>",
@@ -1624,11 +1763,6 @@
         "ongoing": "Удаление…",
         "reason_label": "Причина (необязательно)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Уверены, что хотите отклонить приглашение?",
-        "failed": "Не удалось отклонить приглашение",
-        "title": "Отклонить приглашение"
-    },
     "report_content": {
         "description": "Отчет о данном сообщении отправит свой уникальный 'event ID' администратору вашего домашнего сервера. Если сообщения в этой комнате зашифрованы, администратор вашего домашнего сервера не сможет прочитать текст сообщения или просмотреть какие-либо файлы или изображения.",
         "disagree": "Не согласен",
@@ -1654,35 +1788,59 @@
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Не удалось расшифровать сеансы (%(failedCount)s)!",
         "count_of_successfully_restored_keys": "Успешно восстановлены ключи (%(sessionCount)s)",
-        "enter_key_description": "Получите доступ к своей истории защищенных сообщений и настройте безопасный обмен сообщениями, введя ключ безопасности.",
-        "enter_key_title": "Введите ключ безопасности",
+        "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": "Похоже, это правильный ключ безопасности!",
+        "key_fetch_in_progress": "Получение ключей с сервера…",
+        "key_forgotten_text": "Если вы забыли ваш ключ восстановления, вы можете <button> настроить новые параметры восстановления </button>",
+        "key_is_invalid": "Недействительный ключ восстановления",
+        "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": "Ключ безопасности не подходит",
+        "phrase_forgotten_text": "Если вы забыли секретную фразу, вы можете <button1> использовать ключ восстановления </button1> или <button2> настроить новые параметры восстановления. </button2>",
+        "recovery_key_mismatch_description": "Не удалось расшифровать резервную копию с помощью этого ключа восстановления. Убедитесь, что вы ввели правильный ключ восстановления.",
+        "recovery_key_mismatch_title": "Несоответствие ключа восстановления",
         "restore_failed_error": "Невозможно восстановить резервную копию"
     },
     "right_panel": {
-        "add_integrations": "Добавить виджеты, мосты и ботов",
+        "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": {
+                "one": "1 Закреплённое сообщение",
+                "few": "%(count)s Закреплённых сообщения",
+                "many": "%(count)s Закреплённых сообщений"
+            },
             "limits": {
                 "other": "Вы можете закрепить не более %(count)s виджетов"
-            }
+            },
+            "menu": "Открыть меню",
+            "release_announcement": {
+                "close": "Ок",
+                "description": "Все прикрепленные сообщения можно найти здесь. Наведите курсор на любое сообщение и нажмите «Закрепить», чтобы добавить его.",
+                "title": "Все новые закрепленные сообщения"
+            },
+            "reply_thread": "Ответ на сообщение в <link>обсуждениях</link>",
+            "unpin_all": {
+                "button": "Открепить все сообщения",
+                "content": "Убедитесь, что вы действительно хотите удалить все прикреплённые сообщения. Это действие нельзя отменить.",
+                "title": "Открепить все сообщения?"
+            },
+            "view": "Просмотр в хронологии"
         },
-        "pinned_messages_button": "Закреплено",
+        "pinned_messages_button": "Закрепленные сообщения",
         "poll": {
             "active_heading": "Активные опросы",
             "empty_active": "В этой комнате нет активных опросов",
@@ -1738,6 +1896,7 @@
             "forget": "Забыть комнату",
             "low_priority": "Маловажные",
             "mark_read": "Отметить как прочитанное",
+            "mark_unread": "Отметить как непрочитанное",
             "notifications_default": "Соответствует настройке по умолчанию",
             "notifications_mute": "Заглушить комнату",
             "title": "Настройки комнаты",
@@ -1772,7 +1931,8 @@
         },
         "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",
@@ -1787,6 +1947,8 @@
             },
             "room_is_public": "Это публичная комната"
         },
+        "header_avatar_open_settings_label": "Открыть настройки комнаты",
+        "header_face_pile_tooltip": "Люди",
         "header_untrusted_label": "Ненадёжный",
         "inaccessible": "Эта комната или пространство в данный момент недоступны.",
         "inaccessible_name": "%(roomName)s на данный момент недоступна.",
@@ -1810,7 +1972,6 @@
             "you_created": "Вы создали эту комнату."
         },
         "invite_email_mismatch_suggestion": "Введите адрес эл.почты в Настройках, чтобы получать приглашения прямо в %(brand)s.",
-        "invite_reject_ignore": "Отклонить и заигнорировать пользователя",
         "invite_sent_to_email": "Это приглашение было отправлено на %(email)s",
         "invite_sent_to_email_room": "Это приглашение в %(roomName)s было отправлено на %(email)s",
         "invite_subtitle": "<userName/> пригласил(а) вас",
@@ -1856,11 +2017,22 @@
         "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": "Посмотреть все"
+        },
         "read_topic": "Нажмите, чтобы увидеть тему",
         "rejecting": "Отклонение приглашения…",
         "rejoin_button": "Пере-присоединение",
         "search": {
             "all_rooms_button": "Поиск по всем комнатам",
+            "placeholder": "Поиск сообщений...",
+            "summary": {
+                "one": "Найден 1 результат по запросу «<query/>»",
+                "few": "%(count)s результата найдено по запросу “<query/>”",
+                "many": "%(count)s результатов найдено по запросу “<query/>”"
+            },
             "this_room_button": "Поиск в этой комнате"
         },
         "status_bar": {
@@ -1901,20 +2073,52 @@
         "add_space_label": "Добавить пространство",
         "breadcrumbs_empty": "Нет недавно посещенных комнат",
         "breadcrumbs_label": "Недавно посещённые комнаты",
+        "empty": {
+            "no_chats": "Пока нет доступных чатов",
+            "no_chats_description": "Начните с отправки сообщений или создания комнаты",
+            "no_chats_description_no_room_rights": "Начните переписку с отправки сообщения",
+            "no_favourites": "У вас пока нет чатов в Избранное",
+            "no_favourites_description": "Вы можете добавить в Избранное в настройках чата",
+            "no_people": "У вас пока нет личных чатов",
+            "no_people_description": "Вы можете убрать фильтры, чтобы увидеть другие ваши чаты",
+            "no_rooms": "Вы еще не находитесь ни в одной комнате",
+            "no_rooms_description": "Вы можете убрать фильтры, чтобы увидеть другие ваши чаты",
+            "no_unread": "Поздравляю! У вас нет непрочитанных сообщений",
+            "show_chats": "Показать все чаты"
+        },
         "failed_add_tag": "Не удалось добавить тег %(tagName)s в комнату",
         "failed_remove_tag": "Не удалось удалить тег %(tagName)s из комнаты",
         "failed_set_dm_tag": "Не удалось установить метку личного сообщения",
+        "filters": {
+            "favourite": "Избранное",
+            "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": "Настройки уведомлений",
+        "primary_filters": "Фильтры комнат",
         "redacting_messages_status": {
             "one": "Удаляются сообщения в %(count)s комнате",
             "other": "Удаляются сообщения в %(count)s комнатах"
         },
+        "room": {
+            "more_options": "Дополнительные параметры"
+        },
         "show_less": "Показать меньше",
         "show_n_more": {
             "other": "Показать ещё %(count)s",
@@ -2128,12 +2332,14 @@
             "join_rule_restricted_dialog_heading_unknown": "Это, скорее всего, те, в которых участвуют другие администраторы комнат.",
             "join_rule_restricted_dialog_title": "Выберите места",
             "join_rule_restricted_n_more": {
-                "other": "и %(count)s ещё",
-                "one": "и %(count)s еще"
+                "one": "и еще %(count)s",
+                "few": "и еще %(count)s",
+                "many": "и еще %(count)s"
             },
             "join_rule_restricted_summary": {
-                "other": "В настоящее время %(count)s пространств имеют доступ",
-                "one": "В настоящее время пространство имеет доступ"
+                "one": "В настоящее время пространство имеет доступ",
+                "few": "В настоящее время %(count)s пространства имеют доступ",
+                "many": "В настоящее время %(count)s пространств имеют доступ"
             },
             "join_rule_restricted_upgrade_description": "Это обновление позволит участникам выбранных пространств получить доступ в эту комнату без приглашения.",
             "join_rule_restricted_upgrade_warning": "Эта комната находится в некоторых пространствах, администратором которых вы не являетесь. В этих пространствах старая комната будет по-прежнему отображаться, но людям будет предложено присоединиться к новой.",
@@ -2224,14 +2430,18 @@
             "brand_version": "Версия %(brand)s:",
             "clear_cache_reload": "Очистить кэш и перезагрузить",
             "crypto_version": "Криптоверсия:",
+            "dialog_title": "<strong>Настройки:</strong> Помощь и информация",
             "help_link": "Для получения помощи по использованию %(brand)s, нажмите <a>здесь</a>.",
-            "homeserver": "Homeserver это <code>%(homeserverUrl)s</code>",
-            "identity_server": "Сервер идентификации - это <code>%(identityServerUrl)s</code>",
+            "homeserver": "Домашний сервер: <code>%(homeserverUrl)s</code>",
+            "identity_server": "Сервер идентификации: <code>%(identityServerUrl)s</code>",
             "title": "Помощь и о программе",
             "versions": "Версии"
         }
     },
     "settings": {
+        "account": {
+            "title": "Учетная запись"
+        },
         "all_rooms_home": "Показывать все комнаты на Главной",
         "all_rooms_home_description": "Все комнаты, в которых вы находитесь, будут отображаться на Главной.",
         "always_show_message_timestamps": "Всегда показывать время отправки сообщений",
@@ -2240,9 +2450,13 @@
             "custom_font_description": "Установите имя шрифта, установленного в вашей системе, и %(brand)s попытается его использовать.",
             "custom_font_name": "Название системного шрифта",
             "custom_font_size": "Использовать другой размер",
+            "custom_theme_add": "Добавить пользовательскую тему",
+            "custom_theme_downloading": "Загрузка пользовательской темы…",
             "custom_theme_error_downloading": "Ошибка при загрузке информации темы.",
             "custom_theme_invalid": "Неверная схема темы.",
             "font_size": "Размер шрифта",
+            "font_size_default": "%(fontSize)s (по умолчанию)",
+            "high_contrast": "Высокая контрастность",
             "image_size_default": "По умолчанию",
             "image_size_large": "Большой",
             "layout_bubbles": "Пузыри сообщений",
@@ -2257,9 +2471,69 @@
         "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.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Данные вашей учетной записи, контакты, настройки и список чатов будут сохранены",
+                "breadcrumb_page": "Сбросить шифрование",
+                "breadcrumb_second_description": "Вы потеряете историю сообщений, которая хранится только на сервере",
+                "breadcrumb_third_description": "Вам нужно будет заново подтвердить все существующие устройства и контакты.",
+                "breadcrumb_title": "Вы уверены, что хотите сбросить свою идентификацию?",
+                "breadcrumb_title_forgot": "Забыли ключ восстановления? Вам нужно будет восстановить свою идентификацию.",
+                "breadcrumb_warning": "Делайте это только в том случае, если вы считаете, что ваша учетная запись взломана.",
+                "details_title": "Сведения о шифровании",
+                "do_not_close_warning": "Не закрывайте это окно до тех пор, пока сброс не будет завершен",
+                "export_keys": "Экспортировать ключи",
+                "import_keys": "Импортировать ключи",
+                "other_people_device_description": "Внимание: пользователи, которые явно не подтвердили вашу личность (например, с помощью emoji), не получат ваши зашифрованные сообщения. Кроме того, неверифицированные устройства верифицированных пользователей не будут получать ваши зашифрованные сообщения.",
+                "other_people_device_label": "В зашифрованных комнатах отправляйте сообщения только проверенным пользователям",
+                "other_people_device_title": "Устройства других людей",
+                "reset_identity": "Сбросить криптографическую идентификацию",
+                "reset_in_progress": "Выполняется сброс...",
+                "session_id": "ID сеанса:",
+                "session_key": "Ключ сеанса:",
+                "title": "Дополнительно"
+            },
+            "delete_key_storage": {
+                "breadcrumb_page": "Удалить хранилище ключей",
+                "confirm": "Удалить хранилище ключей",
+                "description": "Удаление хранилища ключей приведёт к удалению вашей идентификации и ключей сообщений с сервера, а также отключению следующих функций безопасности:",
+                "list_first": "Нет зашифрованной истории сообщений на новых устройствах",
+                "list_second": "Вы потеряете доступ к своим зашифрованным сообщениям, если вы выйдете из %(brand)s везде",
+                "title": "Вы уверены, что хотите отключить хранение ключей и удалить их?"
+            },
+            "device_not_verified_button": "Проверить это устройство",
+            "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_title": "Введите новый ключ восстановления",
+                "change_recovery_key": "Изменить ключ восстановления",
+                "change_recovery_key_title": "Изменить ключ восстановления?",
+                "enter_key_error": "Ключ восстановления, который вы ввел, неверный.",
+                "enter_recovery_key": "Введите ключ восстановления",
+                "forgot_recovery_key": "Забыли ключ восстановления?",
+                "save_key_description": "Не сообщайте эту информацию никому!",
+                "save_key_title": "Ключ восстановления",
+                "set_up_recovery": "Настройка восстановления",
+                "set_up_recovery_confirm_button": "Завершить настройку",
+                "set_up_recovery_confirm_title": "Для подтверждения введите ключ восстановления",
+                "set_up_recovery_save_key_description": "Запишите ключ восстановления в безопасном месте, например в диспетчере паролей, зашифрованной заметке или физическом сейфе.",
+                "set_up_recovery_save_key_title": "Сохраните ключ восстановления в безопасном месте",
+                "title": "Восстановление"
+            },
+            "title": "Шифрование"
+        },
         "general": {
             "account_management_section": "Управление учётной записью",
             "account_section": "Учётная запись",
@@ -2272,6 +2546,14 @@
             "add_msisdn_dialog_title": "Добавить номер телефона",
             "add_msisdn_instructions": "Текстовое сообщение было отправлено +%(msisdn)s. Пожалуйста, введите проверочный код, который он содержит.",
             "add_msisdn_misconfigured": "Поток add/bind с 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": "Вы уверены, что хотите деактивировать свою учётную запись? Это необратимое действие.",
@@ -2287,10 +2569,13 @@
             "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_address_in_use": "Этот адрес электронной почты уже используется",
             "email_address_label": "Адрес электронной почты",
             "email_not_verified": "Ваш адрес электронной почты еще не проверен",
@@ -2315,7 +2600,7 @@
             "error_share_msisdn_discovery": "Не удается предоставить общий доступ к номеру телефона",
             "identity_server_no_token": "Не найден токен доступа для идентификации",
             "identity_server_not_set": "Сервер идентификации не установлен",
-            "language_section": "Язык и регион",
+            "language_section": "Язык",
             "msisdn_in_use": "Этот номер телефона уже используется",
             "msisdn_label": "Номер телефона",
             "msisdn_verification_field_label": "Код подтверждения",
@@ -2324,11 +2609,15 @@
             "oidc_manage_button": "Настройки аккаунта",
             "password_change_section": "Установите новый пароль…",
             "password_change_success": "Ваш пароль успешно изменён.",
+            "personal_info": "Личная информация",
+            "profile_subtitle": "Так вас видят другие пользователи приложения.",
             "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": "Имя пользователя"
         },
-        "image_thumbnails": "Предпросмотр/миниатюры для изображений",
         "inline_url_previews_default": "Предпросмотр ссылок по умолчанию",
         "inline_url_previews_room": "Включить предпросмотр ссылок для участников этой комнаты по умолчанию",
         "inline_url_previews_room_account": "Включить предпросмотр ссылок в этой комнате (влияет только на вас)",
@@ -2350,13 +2639,13 @@
                 "enter_phrase_description": "Введите секретную фразу, известную только вам, так как она используется для защиты ваших данных. В целях безопасности не следует повторно использовать пароль своей учетной записи.",
                 "enter_phrase_title": "Введите секретную фразу",
                 "enter_phrase_to_confirm": "Введите секретную фразу второй раз, чтобы подтвердить ее.",
-                "generate_security_key_description": "Мы создадим ключ безопасности для вас, чтобы вы могли хранить его в надежном месте, например, в менеджере паролей или сейфе.",
+                "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": "Подтвердите секретную фразу",
@@ -2382,12 +2671,20 @@
             "phrase_strong_enough": "Отлично! Эта парольная фраза выглядит достаточно надежной"
         },
         "keyboard": {
+            "dialog_title": "<strong>Настройки:</strong> Клавиатура",
             "title": "Горячие клавиши"
         },
+        "labs": {
+            "dialog_title": "<strong>Настройки:</strong> Лаборатория"
+        },
+        "labs_mjolnir": {
+            "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>.",
@@ -2432,7 +2729,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": "При обновлении комнат",
@@ -2446,12 +2743,14 @@
             "code_blocks_heading": "Блоки кода",
             "compact_modern": "Использовать более компактный \"Современный\" макет",
             "composer_heading": "Редактор",
+            "dialog_title": "<strong>Настройки:</strong> Параметры",
             "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": "Каталог комнат",
@@ -2459,59 +2758,25 @@
             "show_avatars_pills": "Показывать аватары в упоминаниях пользователей, комнатах и событиях",
             "show_polls_button": "Показывать кнопку опроса",
             "surround_text": "Обводить выделенный текст при вводе специальных символов",
-            "time_heading": "Отображение времени"
+            "time_heading": "Отображение времени",
+            "user_timezone": "Установить часовой пояс"
         },
         "prompt_invite": "Подтверждать отправку приглашений на потенциально недействительные matrix ID",
         "replace_plain_emoji": "Автоматически заменять текстовые смайлики на графические",
         "security": {
-            "4s_public_key_in_account_data": "в данных учётной записи",
-            "4s_public_key_status": "Публичный ключ секретного хранилища:",
             "analytics_description": "Делитесь анонимными данными, чтобы помочь нам выявить проблемы. Ничего личного. Никаких третьих лиц.",
-            "backup_key_cached_status": "Резервный ключ кэширован:",
-            "backup_key_stored_status": "Резервный ключ сохранён:",
-            "backup_key_unexpected_type": "непредвиденный тип",
-            "backup_key_well_formed": "корректный",
-            "backup_keys_description": "Сделайте резервную копию ключей шифрования с данными вашей учетной записи на случай, если вы потеряете доступ к своим сеансам. Ваши ключи будут защищены уникальным ключом безопасности.",
             "bulk_options_accept_all_invites": "Принять все приглашения (%(invitedRooms)s)",
             "bulk_options_reject_all_invites": "Отклонить все %(invitedRooms)s приглашения",
             "bulk_options_section": "Основные опции",
-            "cross_signing_cached": "сохранено локально",
-            "cross_signing_homeserver_support": "Поддержка со стороны домашнего сервера:",
-            "cross_signing_homeserver_support_exists": "существует",
-            "cross_signing_in_4s": "в секретном хранилище",
-            "cross_signing_in_memory": "в памяти",
-            "cross_signing_master_private_Key": "Приватный мастер-ключ:",
-            "cross_signing_not_cached": "не найдено локально",
-            "cross_signing_not_found": "не найдено",
-            "cross_signing_not_in_4s": "не найдено в хранилище",
-            "cross_signing_not_stored": "не сохранено",
-            "cross_signing_private_keys": "Приватные ключи для кросс-подписи:",
-            "cross_signing_public_keys": "Публичные ключи для кросс-подписи:",
-            "cross_signing_self_signing_private_key": "Самоподписанный приватный ключ:",
-            "cross_signing_user_signing_private_key": "Приватный ключ подписи пользователей:",
-            "cryptography_section": "Криптография",
-            "delete_backup": "Удалить резервную копию",
-            "delete_backup_confirm_description": "Вы уверены? Зашифрованные сообщения будут безвозвратно утеряны при отсутствии соответствующего резервного копирования ваших ключей.",
+            "dehydrated_device_enabled": "Устройство в автономном режиме",
+            "dialog_title": "<strong>Настройки:</strong> Безопасность и конфиденциальность",
             "e2ee_default_disabled_warning": "Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.",
             "enable_message_search": "Включить поиск сообщений в зашифрованных комнатах",
             "encryption_section": "Шифрование",
-            "error_loading_key_backup_status": "Не удалось получить статус резервного копирования для ключей шифрования",
-            "export_megolm_keys": "Экспорт ключей шифрования",
             "ignore_users_empty": "У вас нет игнорируемых пользователей.",
             "ignore_users_section": "Игнорируемые пользователи",
-            "import_megolm_keys": "Импорт ключей шифрования",
-            "key_backup_active": "В этом сеансе выполняется резервное копирование ваших ключей.",
-            "key_backup_active_version": "Активная версия резервного копирования:",
-            "key_backup_active_version_none": "Нет",
             "key_backup_algorithm": "Алгоритм:",
-            "key_backup_can_be_restored": "Эту резервную копию можно восстановить в этом сеансе",
-            "key_backup_complete": "Все ключи сохранены",
             "key_backup_connect": "Подключить этот сеанс к резервированию ключей",
-            "key_backup_connect_prompt": "Подключите этот сеанс к резервированию ключей до выхода, чтобы избежать утраты доступных только в этом сеансе ключей.",
-            "key_backup_in_progress": "Резервное копирование %(sessionsRemaining)s ключей…",
-            "key_backup_inactive": "Это сеанс <b>не сохраняет ваши ключи</b>, но у вас есть резервная копия, из которой вы можете их восстановить.",
-            "key_backup_inactive_warning": "Ваши ключи <b>не резервируются с этом сеансе</b>.",
-            "key_backup_latest_version": "Последняя версия резервной копии на сервере:",
             "message_search_disable_warning": "Если этот параметр отключен, сообщения из зашифрованных комнат не будут отображаться в результатах поиска.",
             "message_search_disabled": "Безопасно кэшировать шифрованные сообщения локально, чтобы они появлялись в результатах поиска.",
             "message_search_enabled": {
@@ -2531,13 +2796,7 @@
             "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-адрес для более лёгкого распознавания сеансов в менеджере сеансов",
-            "restore_key_backup": "Восстановить из резервной копии",
-            "secret_storage_not_ready": "не готов",
-            "secret_storage_ready": "готов",
-            "secret_storage_status": "Секретное хранилище:",
             "send_analytics": "Отправить данные аналитики",
-            "session_id": "ID сеанса:",
-            "session_key": "Ключ сеанса:",
             "strict_encryption": "Никогда не отправлять неподтверждённым сеансам зашифрованные сообщения через этот сеанс"
         },
         "send_read_receipts": "Уведомлять о прочтении",
@@ -2548,19 +2807,23 @@
             "browser": "Браузер",
             "confirm_sign_out": {
                 "one": "Подтвердите выход из этого устройства",
-                "other": "Подтвердите выход из этих устройств"
+                "few": "Подтвердите выход из этих устройств",
+                "many": "Подтвердите выход из этих устройств"
             },
             "confirm_sign_out_body": {
                 "one": "Нажмите кнопку ниже, чтобы подтвердить выход из этого устройства.",
-                "other": "Нажмите кнопку ниже, чтобы подтвердить выход из этих устройств."
+                "few": "Нажмите кнопку ниже, чтобы подтвердить выход из этих устройств.",
+                "many": "Нажмите кнопку ниже, чтобы подтвердить выход из этих устройств."
             },
             "confirm_sign_out_continue": {
                 "one": "Выйти из устройства",
-                "other": "Выйти из устройств"
+                "few": "Выйти из устройств",
+                "many": "Выйти из устройств"
             },
             "confirm_sign_out_sso": {
                 "one": "Подтвердите выход из этого устройства с помощью единого входа, чтобы подтвердить свою личность.",
-                "other": "Подтвердите выход из этих устройств с помощью единого входа, чтобы подтвердить свою личность."
+                "few": "Подтвердите выход из этих устройств с помощью единого входа, чтобы подтвердить свою личность.",
+                "many": "Подтвердите выход из этих устройств с помощью единого входа, чтобы подтвердить свою личность."
             },
             "current_session": "Текущий сеанс",
             "desktop_session": "Сеанс рабочего стола",
@@ -2569,6 +2832,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": "Все",
@@ -2585,10 +2849,12 @@
             "inactive_sessions_list_description": "Сочтите выйти из старых сеансов (%(inactiveAgeDays)s дней и более), которые вы более не используете.",
             "ip": "IP-адрес",
             "last_activity": "Последняя активность",
+            "manage": "Управление этим сеансом",
             "mobile_session": "Сеанс мобильного устройства",
             "n_sessions_selected": {
                 "one": "%(count)s сеанс выбран",
-                "other": "Сеансов выбрано: %(count)s"
+                "few": "%(count)s сеанса выбраны",
+                "many": "%(count)s сеансов выбрано"
             },
             "no_inactive_sessions": "Неактивных сеансов не обнаружено.",
             "no_sessions": "Сеансов не найдено.",
@@ -2608,18 +2874,21 @@
             "security_recommendations_description": "Усильте защиту учётной записи, следуя этим рекомендациям.",
             "session_id": "ID сеанса",
             "show_details": "Показать подробности",
-            "sign_in_with_qr": "Войти с QR кодом",
-            "sign_in_with_qr_button": "Показать QR код",
-            "sign_in_with_qr_description": "Вы можете использовать это устройство для входа на новом устройство с помощью QR-кода. Вам необходимо отсканировать данный QR-код на новом устройстве.",
+            "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 сеансов?"
+                "few": "Вы уверены, что хотите выйти из %(count)s сеансов?",
+                "many": "Вы уверены, что хотите выйти из %(count)s сеансов?"
             },
             "sign_out_n_sessions": {
                 "one": "Выйти из %(count)s сеанса",
-                "other": "Выйти из сеансов: %(count)s"
+                "few": "Выйти из %(count)s сеансов",
+                "many": "Выйти из %(count)s сеансов"
             },
             "title": "Сеансы",
             "unknown_session": "Неизвестный тип сеанса",
@@ -2650,7 +2919,9 @@
         "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": "Показать все комнаты на Главной, даже если они находятся в пространстве.",
@@ -2659,10 +2930,14 @@
             "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": "Автозапуск при входе в систему",
+        "tac_only_notifications": "Показывать уведомления только в центре активностей обсуждений",
         "use_12_hour_format": "Отображать время в 12 часовом формате (напр. 2:30pm)",
         "use_command_enter_send_message": "Cmd + Enter, чтобы отправить сообщение",
         "use_command_f_search": "Используйте Command + F для поиска в ленте сообщений",
@@ -2676,6 +2951,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-адрес будет виден на время звонка.",
@@ -2694,8 +2970,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": "Поделиться пользователем"
@@ -2766,8 +3046,6 @@
         "topic": "Читает или устанавливает тему комнаты",
         "topic_none": "У этой комнаты нет темы.",
         "topic_room_error": "Не удалось получить тему комнаты: не удалось найти комнату (%(roomId)s",
-        "tovirtual": "Переключается на виртуальную комнату, если ваша комната её имеет",
-        "tovirtual_not_found": "Эта комната не имеет виртуальной комнаты",
         "unban": "Разблокирует пользователя с заданным ID",
         "unflip": "Добавляет ┬──┬ ノ( ゜-゜ノ) в начало сообщения",
         "unholdcall": "Прекратить удержание вызова в текущей комнате",
@@ -2785,6 +3063,7 @@
         "view": "Просмотр комнаты с указанным адресом",
         "whois": "Показать информацию о пользователе"
     },
+    "sliding_sync_legacy_no_longer_supported": "Устаревший протокол Sliding sync больше не поддерживается: выйди из системы и войди снова, чтобы включить новый протокол Sliding sync",
     "space": {
         "add_existing_room_space": {
             "create": "Хотите добавить новую комнату?",
@@ -2890,7 +3169,6 @@
         "heading_without_query": "Поиск",
         "join_button_text": "Присоединиться к %(roomAddress)s",
         "keyboard_scroll_hint": "Используйте <arrows/> для прокрутки",
-        "message_search_section_title": "Другие поиски",
         "other_rooms_in_space": "Прочие комнаты в %(spaceName)s",
         "public_rooms_label": "Публичные комнаты",
         "public_spaces_label": "Публичное пространство",
@@ -2900,7 +3178,6 @@
         "result_may_be_hidden_privacy_warning": "Некоторые результаты могут быть скрыты из-за конфиденциальности",
         "result_may_be_hidden_warning": "Некоторые результаты могут быть скрыты",
         "search_dialog": "Окно поиска",
-        "search_messages_hint": "Для поиска сообщений найдите этот значок <icon/> в верхней части комнаты",
         "spaces_title": "Ваши пространства",
         "start_group_chat_button": "Начать групповой чат"
     },
@@ -2932,17 +3209,26 @@
     "thread_view_back_action_label": "Вернуться к обсуждению",
     "threads": {
         "all_threads": "Все обсуждения",
-        "all_threads_description": "Показывает все обсуждения из текущей комнаты",
+        "all_threads_description": "Отобразит все обсуждения из текущей комнаты",
         "count_of_reply": {
             "one": "%(count)s ответ",
-            "other": "%(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": "около часа назад",
@@ -2984,9 +3270,19 @@
         },
         "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": "Подтвержденная личность изменилась",
+            "unable_to_decrypt": "Не удалось расшифровать сообщение"
+        },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Расшифровка",
         "download_action_downloading": "Загрузка",
+        "download_failed": "Загрузка не удалась",
+        "e2e_state": "Состояние сквозного шифрования",
         "edits": {
             "tooltip_label": "Изменено %(date)s. Нажмите для посмотра истории изменений.",
             "tooltip_sub": "Нажмите для просмотра правок",
@@ -3040,7 +3336,7 @@
         },
         "m.file": {
             "error_decrypting": "Ошибка расшифровки вложения",
-            "error_invalid": "Недопустимый файл%(extra)s"
+            "error_invalid": "Недопустимый формат файла"
         },
         "m.image": {
             "error": "Невозможно показать изображение из-за ошибки",
@@ -3414,7 +3710,9 @@
         }
     },
     "truncated_list_n_more": {
-        "other": "Еще %(count)s…"
+        "one": "%(count)s...",
+        "few": "И еще %(count)s...",
+        "many": "И еще %(count)s..."
     },
     "unsupported_server_description": "На этом сервере используется старая версия Matrix. Перейдите на Matrix%(version)s, чтобы использовать %(brand)s ее без ошибок.",
     "unsupported_server_title": "Ваш сервер не поддерживается",
@@ -3517,6 +3815,7 @@
         "verify_explainer": "Для дополнительной безопасности подтвердите этого пользователя, сравнив одноразовый код на ваших устройствах."
     },
     "user_menu": {
+        "link_new_device": "Привязать новое устройство",
         "settings": "Все настройки",
         "switch_theme_dark": "Переключить в тёмный режим",
         "switch_theme_light": "Переключить в светлый режим"
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 6697b16e70..521ef69175 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -1,15 +1,34 @@
 {
     "a11y": {
+        "emoji_picker": "Výber emotikonov",
         "jump_first_invite": "Prejsť na prvú pozvánku.",
+        "message_composer": "Editor správ",
         "n_unread_messages": {
-            "other": "%(count)s neprečítaných správ.",
-            "one": "1 neprečítaná správa."
+            "one": "1 neprečítaná správa.",
+            "few": "%(count)s neprečítané správy.",
+            "other": "%(count)s neprečítaných správ."
         },
         "n_unread_messages_mentions": {
             "one": "1 neprečítaná zmienka.",
+            "few": "%(count)s neprečítané správy vrátane zmienok.",
             "other": "%(count)s neprečítaných správ vrátane zmienok."
         },
+        "recent_rooms": "Nedávne miestnosti",
+        "room_messsage_not_sent": "Otvoriť miestnosť %(roomName)s s neodoslanou správou.",
+        "room_n_unread_invite": "Otvoriť pozvánku miestnosti %(roomName)s.",
+        "room_n_unread_messages": {
+            "one": "Otvoriť miestnosť %(roomName)s s 1 neprečítanou správou.",
+            "few": "Otvoriť miestnosť %(roomName)s s %(count)s neprečítanými správami.",
+            "other": "Otvoriť miestnosť %(roomName)s s %(count)s neprečítanými správami."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Otvoriť miestnosť %(roomName)s s 1 neprečítanou zmienkou.",
+            "few": "Otvoriť miestnosť %(roomName)s s %(count)s neprečítanými správami vrátane zmienok.",
+            "other": "Otvoriť miestnosť %(roomName)s s %(count)s neprečítanými správami vrátane zmienok."
+        },
         "room_name": "Miestnosť %(name)s",
+        "room_status_bar": "Stavový riadok miestnosti",
+        "seek_bar_label": "Panel vyhľadávania zvuku",
         "unread_messages": "Neprečítané správy.",
         "user_menu": "Používateľské menu"
     },
@@ -40,6 +59,8 @@
         "create_a_room": "Vytvoriť miestnosť",
         "create_account": "Vytvoriť účet",
         "decline": "Odmietnuť",
+        "decline_and_block": "Odmietnuť a zablokovať",
+        "decline_invite": "Odmietnuť pozvanie",
         "delete": "Vymazať",
         "deny": "Zamietnuť",
         "disable": "Nepovoliť",
@@ -59,6 +80,7 @@
         "go": "Spustiť",
         "go_back": "Naspäť",
         "got_it": "Rozumiem",
+        "hide": "Skryť",
         "hide_advanced": "Skryť pokročilé možnosti",
         "hold": "Podržať",
         "ignore": "Ignorovať",
@@ -75,12 +97,14 @@
         "maximise": "Maximalizovať",
         "mention": "Zmieniť sa",
         "minimise": "Minimalizovať",
+        "new_message": "Nová správa",
         "new_room": "Nová miestnosť",
         "new_video_room": "Nová video miestnosť",
         "next": "Ďalej",
         "no": "Nie",
         "ok": "OK",
         "open": "Otvoriť",
+        "open_menu": "Otvoriť ponuku",
         "pause": "Pozastaviť",
         "pin": "Špendlík",
         "play": "Prehrať",
@@ -89,13 +113,13 @@
         "react": "Reagovať",
         "refresh": "Obnoviť",
         "register": "Zaregistrovať",
-        "reject": "Odmietnuť",
         "reload": "Znovu načítať",
         "remove": "Odstrániť",
         "rename": "Premenovať",
         "reply": "Odpovedať",
         "reply_in_thread": "Odpovedať vo vlákne",
         "report_content": "Nahlásiť obsah",
+        "report_room": "Nahlásiť miestnosť",
         "resend": "Poslať znovu",
         "reset": "Obnoviť predvolené",
         "resume": "Pokračovať",
@@ -105,6 +129,7 @@
         "save": "Uložiť",
         "search": "Hľadať",
         "send_report": "Odoslať hlásenie",
+        "set_avatar": "Nastaviť profilový obrázok",
         "share": "Zdieľať",
         "show": "Zobraziť",
         "show_advanced": "Ukázať pokročilé možnosti",
@@ -128,6 +153,7 @@
         "update": "Aktualizovať",
         "upgrade": "Aktualizovať",
         "upload": "Nahrať",
+        "upload_file": "Nahrať súbor",
         "verify": "Overiť",
         "view": "Zobraziť",
         "view_all": "Zobraziť všetky",
@@ -135,6 +161,7 @@
         "view_message": "Zobraziť správu",
         "view_source": "Zobraziť zdroj",
         "yes": "Áno",
+        "yes_dismiss": "Áno, zamietnuť",
         "zoom_in": "Priblížiť",
         "zoom_out": "Oddialiť"
     },
@@ -222,6 +249,7 @@
         },
         "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",
+        "mobile_create_account_title": "Chystáte sa vytvoriť účet na %(hsName)s",
         "msisdn_field_description": "Ostatní používatelia vás môžu pozývať do miestností pomocou vašich kontaktných údajov",
         "msisdn_field_label": "Telefón",
         "msisdn_field_number_invalid": "Toto telefónne číslo nevyzerá úplne správne, skontrolujte ho a skúste to znova",
@@ -239,11 +267,40 @@
         "phone_label": "Telefón",
         "phone_optional_label": "Telefón (nepovinné)",
         "qr_code_login": {
+            "check_code_explainer": "Týmto sa overí, že pripojenie k vášmu druhému zariadeniu je bezpečné.",
+            "check_code_heading": "Zadajte číslo zobrazené na vašom druhom zariadení",
+            "check_code_input_label": "2-ciferný kód",
+            "check_code_mismatch": "Čísla sa nezhodujú",
             "completing_setup": "Dokončenie nastavenia nového zariadenia",
-            "error_unexpected": "Vyskytla sa neočakávaná chyba.",
-            "scan_code_instruction": "Naskenujte nižšie uvedený QR kód pomocou zariadenia, ktoré je odhlásené.",
-            "scan_qr_code": "Skenovať QR kód",
+            "error_etag_missing": "Vyskytla sa neočakávaná chyba. Môže to byť spôsobené rozšírením prehliadača, proxy servera alebo nesprávnou konfiguráciou servera.",
+            "error_expired": "Platnosť prihlásenia vypršala. Prosím, skúste to znova.",
+            "error_expired_title": "Prihlásenie nebolo dokončené včas",
+            "error_insecure_channel_detected": "K novému zariadeniu sa nepodarilo vytvoriť zabezpečené pripojenie. Vaše existujúce zariadenia sú stále v bezpečí a nemusíte sa o ne obávať.",
+            "error_insecure_channel_detected_instructions": "Čo teraz?",
+            "error_insecure_channel_detected_instructions_1": "Skúste sa znova prihlásiť do druhého zariadenia pomocou QR kódu v prípade, že ide o problém so sieťou",
+            "error_insecure_channel_detected_instructions_2": "Ak narazíte na rovnaký problém, skúste inú sieť Wi-Fi alebo namiesto siete Wi-Fi použite mobilné dáta",
+            "error_insecure_channel_detected_instructions_3": "Ak to nefunguje, prihláste sa manuálne",
+            "error_insecure_channel_detected_title": "Pripojenie nie je zabezpečené",
+            "error_other_device_already_signed_in": "Nemusíte robiť nič iné.",
+            "error_other_device_already_signed_in_title": "Vaše druhé zariadenie je už prihlásené",
+            "error_rate_limited": "Príliš veľa pokusov v krátkom čase. Počkajte chvíľu, kým to skúsite znova.",
+            "error_unexpected": "Vyskytla sa neočakávaná chyba. Požiadavka na pripojenie vášho druhého zariadenia bola zrušená.",
+            "error_unsupported_protocol": "Toto zariadenie nepodporuje prihlásenie do druhého zariadenia pomocou QR kódu.",
+            "error_unsupported_protocol_title": "Druhé zariadenie nie je kompatibilné",
+            "error_user_cancelled": "Prihlásenie bolo zrušené na druhom zariadení.",
+            "error_user_cancelled_title": "Žiadosť o prihlásenie bola zrušená",
+            "error_user_declined": "Odmietli ste žiadosť o prihlásenie zo svojho druhého zariadenia.",
+            "error_user_declined_title": "Prihlásenie bolo odmietnuté",
+            "follow_remaining_instructions": "Postupujte podľa zostávajúcich pokynov",
+            "open_element_other_device": "Otvorte %(brand)s na svojom druhom zariadení",
+            "point_the_camera": "Naskenujte tu zobrazený QR kód",
+            "scan_code_instruction": "Naskenujte QR kód pomocou druhého zariadenia",
+            "scan_qr_code": "Prihláste sa pomocou QR kódu",
+            "security_code": "Bezpečnostný kód",
+            "security_code_prompt": "Ak sa zobrazí výzva, zadajte nižšie uvedený kód na svojom druhom zariadení.",
             "select_qr_code": "Vyberte '%(scanQRCode)s'",
+            "unsupported_explainer": "Poskytovateľ vášho účtu nepodporuje prihlásenie do nového zariadenia pomocou QR kódu.",
+            "unsupported_heading": "QR kód nie je podporovaný",
             "waiting_for_device": "Čaká sa na prihlásenie zariadenia"
         },
         "register_action": "Vytvoriť účet",
@@ -302,7 +359,7 @@
         "set_email_prompt": "Želáte si nastaviť emailovú adresu?",
         "sign_in_description": "Ak chcete pokračovať, použite svoje konto.",
         "sign_in_instead": "Radšej sa prihlásiť",
-        "sign_in_instead_prompt": "Radšej sa prihlásiť",
+        "sign_in_instead_prompt": "Už máte účet? <a>Prihláste sa tu</a>",
         "sign_in_or_register": "Prihlásiť sa alebo vytvoriť nový účet",
         "sign_in_or_register_description": "Použite váš existujúci účet alebo si vytvorte nový, aby ste mohli pokračovať.",
         "sign_in_prompt": "Máte účet? <a>Prihláste sa</a>",
@@ -332,6 +389,9 @@
             "email_resend_prompt": "Nedostali ste ho? <a>Poslať znova</a>",
             "email_resent": "Znova odoslané!",
             "fallback_button": "Spustiť overenie",
+            "mas_cross_signing_reset_cta": "Prejdite do svojho účtu",
+            "mas_cross_signing_reset_description": "Obnovte svoju totožnosť prostredníctvom poskytovateľa účtu a potom sa vráťte späť a kliknite na tlačidlo „Skúsiť znova“.",
+            "mas_cross_signing_reset_title": "Prejdite do svojho účtu a obnovte svoju totožnosť",
             "msisdn": "Na číslo %(msisdn)s bola odoslaná textová správa",
             "msisdn_token_incorrect": "Neplatný token",
             "msisdn_token_prompt": "Prosím, zadajte kód z tejto správy:",
@@ -366,6 +426,15 @@
         "download_logs": "Stiahnuť záznamy",
         "downloading_logs": "Sťahovanie záznamov",
         "error_empty": "Povedzte nám prosím, čo sa pokazilo, alebo radšej vytvorte príspevok v službe GitHub, v ktorom problém popíšete.",
+        "failed_download_logs": "Nepodarilo sa stiahnuť záznamy ladenia: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Vaša správa o chybe bola zamietnutá. Server rageshake túto aplikáciu nepodporuje.",
+            "rejected_generic": "Vaše hlásenie o chybe bolo zamietnuté. Server rageshake odmietol obsah správy kvôli pravidlám.",
+            "rejected_recovery_key": "Vaša správa o chybe bola z bezpečnostných dôvodov zamietnutá, pretože obsahovala kľúč na obnovenie.",
+            "rejected_version": "Vaša správa o chybe bola zamietnutá, pretože verzia, ktorú používate, je príliš stará.",
+            "server_unknown_error": "Server rageshake narazil na neznámu chybu a nedokázal spracovať správu.",
+            "unknown_error": "Nepodarilo sa odoslať protokol."
+        },
         "github_issue": "Správa o probléme na GitHub",
         "introduction": "Ak ste odoslali chybu prostredníctvom služby GitHub, záznamy o ladení nám môžu pomôcť nájsť problém. ",
         "log_request": "Aby ste nám pomohli tomuto v budúcnosti zabrániť, pošlite nám prosím <a>záznamy o chybe</a>.",
@@ -405,10 +474,12 @@
         "access_token": "Prístupový token",
         "accessibility": "Prístupnosť",
         "advanced": "Pokročilé",
+        "all_chats": "Všetky konverzácie",
         "analytics": "Analytické údaje",
         "and_n_others": {
-            "other": "a ďalších %(count)s…",
-            "one": "a jeden ďalší…"
+            "one": "a jeden ďalší…",
+            "few": "a %(count)s ďalší…",
+            "other": "a %(count)s ďalších…"
         },
         "appearance": "Vzhľad",
         "application": "Aplikácia",
@@ -419,10 +490,10 @@
         "beta": "Beta verzia",
         "camera": "Kamera",
         "cameras": "Kamery",
+        "cancel": "Zrušiť",
         "capabilities": "Schopnosti",
         "copied": "Skopírované!",
         "credits": "Poďakovanie",
-        "cross_signing": "Krížové podpisovanie",
         "dark": "Tmavý",
         "description": "Popis",
         "deselect_all": "Zrušiť výber všetkých",
@@ -458,16 +529,20 @@
         "matrix": "Matrix",
         "message": "Správa",
         "message_layout": "Rozloženie správy",
+        "message_timestamp_invalid": "Neplatná časová značka",
         "microphone": "Mikrofón",
         "model": "Model",
+        "moderation_and_safety": "Moderovanie a bezpečnosť",
         "modern": "Moderný",
         "mute": "Umlčať",
         "n_members": {
             "one": "%(count)s člen",
+            "few": "%(count)s členovia",
             "other": "%(count)s členov"
         },
         "n_rooms": {
             "one": "%(count)s miestnosť",
+            "few": "%(count)s miestnosti",
             "other": "%(count)s miestností"
         },
         "name": "Názov",
@@ -495,10 +570,13 @@
         "qr_code": "QR kód",
         "random": "Náhodné",
         "reactions": "Reakcie",
+        "recommended": "Odporúčané",
         "report_a_bug": "Nahlásiť chybu",
         "room": "Miestnosť",
         "room_name": "Názov miestnosti",
         "rooms": "Miestnosti",
+        "save": "Uložiť",
+        "saved": "Uložené",
         "saving": "Ukladanie…",
         "secure_backup": "Bezpečné zálohovanie",
         "select_all": "Vybrať všetky",
@@ -525,6 +603,7 @@
         "unnamed_room": "Nepomenovaná miestnosť",
         "unnamed_space": "Nepomenovaný priestor",
         "unverified": "Neoverené",
+        "updating": "Aktualizuje sa...",
         "user": "Používateľ",
         "user_avatar": "Obrázok v profile",
         "username": "Meno používateľa",
@@ -677,6 +756,13 @@
         "twemoji": "<twemoji>Twemoji</twemoji> emoji grafika je © <author>Twitter, Inc a ďalší prispievatelia</author> používaná podľa podmienok <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Písmo <colr>twemoji-colr</colr> je © <author>Mozilla Foundation</author> používané podľa podmienok <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Ste si istý, že chcete odmietnuť pozvanie do miestnosti \"%(roomName)s\"?",
+        "ignore_user_help": "Neuvidíte žiadne správy ani pozvánky do miestností od tohto používateľa.",
+        "reason_description": "Popíšte dôvod nahlásenia miestnosti.",
+        "report_room_description": "Nahlásiť túto miestnosť poskytovateľovi účtu.",
+        "title": "Odmietnuť pozvanie"
+    },
     "desktop_default_device_name": "%(brand)s Stolný počítač: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktívne widgety",
@@ -684,6 +770,44 @@
         "category_room": "Miestnosť",
         "caution_colon": "Upozornenie:",
         "client_versions": "Verzie klienta",
+        "crypto": {
+            "4s_public_key_in_account_data": "v údajoch o účte",
+            "4s_public_key_not_in_account_data": "nenájdené",
+            "4s_public_key_status": "Verejný kľúč tajného úložiska:",
+            "backup_key_cached": "lokálne uložené",
+            "backup_key_cached_status": "Záložný kľúč uložený vo vyrovnávacej pamäti:",
+            "backup_key_not_stored": "nie je uložený",
+            "backup_key_stored": "v tajnom úložisku",
+            "backup_key_stored_status": "Záložný kľúč uložený:",
+            "backup_key_unexpected_type": "neočakávaný typ",
+            "backup_key_well_formed": "správne vytvorený",
+            "cross_signing": "Krížové podpisovanie",
+            "cross_signing_cached": "lokálne uložené",
+            "cross_signing_not_ready": "Krížové podpisovanie nie je nastavené.",
+            "cross_signing_private_keys_in_storage": "v tajnom úložisku",
+            "cross_signing_private_keys_in_storage_status": "Súkromné kľúče krížového podpisovania:",
+            "cross_signing_private_keys_not_in_storage": "neboli nájdené v úložisku",
+            "cross_signing_public_keys_on_device": "v pamäti",
+            "cross_signing_public_keys_on_device_status": "Verejné kľúče krížového podpisovania:",
+            "cross_signing_ready": "Krížové podpisovanie je pripravené na použitie.",
+            "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",
+            "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.",
+            "key_backup_latest_version": "Najnovšia záložná verzia na serveri:",
+            "key_storage": "Úložisko kľúčov",
+            "master_private_key_cached_status": "Hlavný súkromný kľúč:",
+            "not_found": "nenájdený",
+            "not_found_locally": "nenájdený lokálne",
+            "secret_storage_not_ready": "nie je pripravený",
+            "secret_storage_ready": "pripravený",
+            "secret_storage_status": "Tajné úložisko:",
+            "self_signing_private_key_cached_status": "Súkromný kľúč s vlastným podpisom:",
+            "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",
         "edit_setting": "Upraviť nastavenie",
@@ -740,6 +864,9 @@
         "setting_colon": "Nastavenie:",
         "setting_definition": "Definícia nastavenia:",
         "setting_id": "ID nastavenia",
+        "settings": {
+            "elementCallUrl": "URL adresa Element Call"
+        },
         "settings_explorer": "Prieskumník nastavení",
         "show_hidden_events": "Zobrazovať skryté udalosti v histórii obsahu miestností",
         "spaces": {
@@ -793,52 +920,37 @@
     "empty_room_was_name": "Prázdna miestnosť (bola %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Zadajte svoju bezpečnostnú frázu alebo <button>použite svoj bezpečnostný kľúč</button> pre pokračovanie.",
+            "alternatives": "Ak máte bezpečnostný kľúč alebo bezpečnostnú frázu, bude to fungovať tiež.",
             "key_validation_text": {
-                "invalid_security_key": "Neplatný bezpečnostný kľúč",
-                "recovery_key_is_correct": "Vyzerá to super!",
-                "wrong_file_type": "Nesprávny typ súboru",
-                "wrong_security_key": "Nesprávny bezpečnostný kľúč"
+                "wrong_security_key": "Zadaný kľúč na obnovenie nie je správny."
             },
-            "reset_title": "Obnoviť všetko",
-            "reset_warning_1": "Urobte to len vtedy, ak nemáte iné zariadenie, pomocou ktorého by ste mohli dokončiť overenie.",
-            "reset_warning_2": "Ak všetko obnovíte, reštartujete bez dôveryhodných relácií, bez dôveryhodných používateľov a možno nebudete môcť vidieť predchádzajúce správy.",
+            "privacy_warning": "Uistite sa, že túto obrazovku nikto neuvidí!",
             "restoring": "Obnovenie kľúčov zo zálohy",
-            "security_key_title": "Bezpečnostný kľúč",
-            "security_phrase_incorrect_error": "Nie je možné získať prístup k tajnému úložisku. Skontrolujte, či ste zadali správnu bezpečnostnú frázu.",
-            "security_phrase_title": "Bezpečnostná fráza",
-            "separator": "%(securityKey)s alebo %(recoveryFile)s",
-            "use_security_key_prompt": "Ak chcete pokračovať, použite bezpečnostný kľúč."
+            "security_key_title": "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_not_ready": "Krížové podpisovanie nie je nastavené.",
-        "cross_signing_ready": "Krížové podpisovanie je pripravené na použitie.",
-        "cross_signing_ready_no_backup": "Krížové podpisovanie je pripravené, ale kľúče nie sú zálohované.",
         "cross_signing_room_normal": "Táto miestnosť je end-to-end šifrovaná",
         "cross_signing_room_verified": "Všetci v tejto miestnosti sú overení",
         "cross_signing_room_warning": "Niekto používa neznámu reláciu",
-        "cross_signing_unsupported": "Váš domovský server nepodporuje krížové podpisovanie.",
-        "cross_signing_untrusted": "Váš účet má v tajnom úložisku krížovú podpisovú totožnosť, ale táto relácia jej ešte nedôveruje.",
         "cross_signing_user_normal": "Tohto používateľa ste neoverili.",
         "cross_signing_user_verified": "Tohto používateľa ste overili. Tento používateľ si overil všetky svoje relácie.",
         "cross_signing_user_warning": "Tento používateľ si neoveril všetky svoje relácie.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Vyčistiť kľúče na krížové podpisovanie",
-            "title": "Zničiť kľúče na krížové podpisovanie?",
-            "warning": "Zmazanie kľúčov pre krížové podpisovanie je nenávratné. Každý, s kým ste sa overili, bude vidieť bezpečnostné upozornenia. Toto určite nechcete robiť, dokiaľ ste nestratili všetky zariadenia, s ktorými by ste mohli krížovo podpisovať."
-        },
+        "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_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.",
         "event_shield_reason_unverified_identity": "Šifrované neovereným používateľom.",
         "export_unsupported": "Váš prehliadač nepodporuje požadované kryptografické rozšírenia",
+        "forgot_recovery_key": "Zabudli ste kľúč na obnovenie?",
         "import_invalid_keyfile": "Toto nie je správny súbor s kľúčmi %(brand)s",
         "import_invalid_passphrase": "Kontrola overenia zlyhala: Nesprávne heslo?",
+        "key_storage_out_of_sync": "Vaše úložisko kľúčov nie je synchronizované.",
+        "key_storage_out_of_sync_description": "Potvrďte svoj kľúč na obnovenie, aby ste zachovali prístup k úložisku kľúčov a histórii správ.",
         "messages_not_secure": {
             "cause_1": "Váš domovský server",
             "cause_2": "Domovský server, ku ktorému je pripojený používateľ, ktorého overujete",
@@ -853,7 +965,8 @@
             "title": "Nový spôsob obnovy",
             "warning": "Ak ste si nenastavili nový spôsob obnovenia, 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."
         },
-        "not_supported": "<nepodporované>",
+        "pinned_identity_changed": "Zdá sa, že identita (<b>%(userId)s</b>) používateľa %(displayName)s bola obnovená. <a>Zistiť viac </a>",
+        "pinned_identity_changed_no_displayname": "Identita používateľa <b>%(userId)s</b> bola obnovená. <a>Zistiť viac</a>",
         "recovery_method_removed": {
             "description_1": "Táto relácia zistila, že vaša bezpečnostná fráza a kľúč pre zabezpečené správy boli odstránené.",
             "description_2": "Ak ste to urobili omylom, môžete v tejto relácii nastaviť Zabezpečené správy, ktoré znovu zašifrujú históriu správ tejto relácie pomocou novej metódy obnovy.",
@@ -861,12 +974,16 @@
             "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.",
-            "title": "Nastaviť"
+            "explainer": "Zálohujte si šifrovacie kľúče pred odhlásením, aby ste zabránili ich strate."
         },
+        "turn_on_key_storage": "Zapnúť úložisko kľúčov",
+        "turn_on_key_storage_description": "Uložte svoju kryptografickú totožnosť a kľúče správ bezpečne na serveri. To vám umožní zobraziť históriu správ na všetkých nových zariadeniach.",
         "udd": {
             "interactive_verification_button": "Interaktívne overte pomocou emotikonov",
             "other_ask_verify_text": "Poproste tohto používateľa, aby si overil svoju reláciu alebo ju nižšie manuálne overte.",
@@ -880,7 +997,6 @@
             "accepting": "Akceptovanie…",
             "after_new_login": {
                 "device_verified": "Zariadenie overené",
-                "reset_confirmation": "Skutočne vynulovať overovacie kľúče?",
                 "skip_verification": "Vynechať zatiaľ overovanie",
                 "unable_to_verify": "Nie je možné overiť toto zariadenie",
                 "verify_this_device": "Overiť toto zariadenie"
@@ -902,7 +1018,7 @@
             "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 bezpečnostný kľúč 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.",
+            "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.",
             "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.",
             "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á.",
@@ -915,6 +1031,7 @@
             "qr_reciprocate_same_shield_device": "Už je to takmer hotové! Zobrazuje vaše druhé zariadenie rovnaký š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",
+            "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í",
@@ -940,7 +1057,7 @@
             "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.",
+            "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ť.",
             "verification_dialog_title_device": "Overenie iného zariadenia",
             "verification_dialog_title_user": "Žiadosť o overenie",
             "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í.",
@@ -950,19 +1067,20 @@
             "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_reset_warning_1": "Vynulovanie overovacích kľúčov sa nedá vrátiť späť. Po vynulovaní nebudete mať prístup k starým zašifrovaným správam a všetci priatelia, ktorí vás predtým overili, uvidia bezpečnostné upozornenia, kým sa u nich znovu neoveríte.",
-            "verify_reset_warning_2": "Pokračujte prosím iba vtedy, ak ste si istí, že ste stratili všetky ostatné zariadenia a váš bezpečnostný kľúč.",
             "verify_using_device": "Overiť pomocou iného zariadenia",
-            "verify_using_key": "Overenie bezpečnostným kľúčom",
-            "verify_using_key_or_phrase": "Overiť pomocou bezpečnostného kľúča alebo frázy",
+            "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)…",
             "waiting_other_user": "Čakám na %(displayName)s, kým nás overí…"
         },
         "verification_requested_toast_title": "Vyžiadané overenie",
+        "verified_identity_changed": "Totožnosť používateľa %(displayName)s's (<b>%(userId)s</b>) bola obnovená. <a>Zistiť viac</a>",
+        "verified_identity_changed_no_displayname": "Totožnosť používateľa <b>%(userId)s</b> bola obnovená. <a>Zistiť viac</a>",
         "verify_toast_description": "Ostatní používatelia jej nemusia dôverovať",
-        "verify_toast_title": "Overiť túto reláciu"
+        "verify_toast_title": "Overiť túto reláciu",
+        "withdraw_verification_action": "Zrušiť overenie"
     },
     "error": {
         "admin_contact": "Prosím, <a>kontaktujte správcu služieb</a> aby ste mohli službu ďalej používať.",
@@ -1003,21 +1121,21 @@
         "unknown_error_code": "neznámy kód chyby",
         "update_power_level": "Nepodarilo sa zmeniť úroveň oprávnenia"
     },
-    "error_app_open_in_another_tab": "Aplikácia %(brand)s bola otvorená na inej karte.",
+    "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ť.",
     "error_app_open_in_another_tab_title": "%(brand)s je pripojený na inej karte",
     "error_app_opened_in_another_window": "%(brand)s je otvorený v inom okne. Kliknutím na \"%(label)s\" použijete túto aplikáciu %(brand)s a odpojíte druhé okno.",
-    "error_database_closed_title": "Databáza sa neočakávane zatvorila",
+    "error_database_closed_description": {
+        "for_desktop": "Váš disk môže byť plný. Uvoľnite prosím miesto a znova to načítajte.",
+        "for_web": "Ak ste vymazali údaje o prehliadaní, tak táto správa sa očakáva. %(brand)s môže byť otvorený aj na inej karte alebo je váš disk plný. Uvoľnite prosím miesto a znovu ho načítajte"
+    },
+    "error_database_closed_title": "%(brand)s prestal fungovať",
     "error_dialog": {
         "copy_room_link_failed": {
             "description": "Nie je možné skopírovať odkaz na miestnosť do schránky.",
             "title": "Nie je možné skopírovať odkaz na miestnosť"
         },
         "error_loading_user_profile": "Nie je možné načítať profil používateľa",
-        "forget_room_failed": "Nepodarilo sa zabudnúť miestnosť %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Server môže byť nedostupný, preťažený, alebo vypršal časový limit hľadania :(",
-            "title": "Hľadanie zlyhalo"
-        }
+        "forget_room_failed": "Nepodarilo sa zabudnúť miestnosť %(errCode)s"
     },
     "error_user_not_logged_in": "Používateľ nie je prihlásený",
     "event_preview": {
@@ -1042,7 +1160,15 @@
             "you": "Reagovali ste %(reaction)s na %(message)s"
         },
         "m.sticker": "%(senderName)s: %(stickerName)s",
-        "m.text": "%(senderName)s: %(message)s"
+        "m.text": "%(senderName)s: %(message)s",
+        "prefix": {
+            "audio": "Zvuk",
+            "file": "Súbor",
+            "image": "Obrázok",
+            "poll": "Anketa",
+            "video": "Video"
+        },
+        "preview": "<bold>%(prefix)s:</bold> %(preview)s"
     },
     "export_chat": {
         "cancelled": "Export zrušený",
@@ -1137,9 +1263,10 @@
     "identity_server": {
         "change": "Zmeniť server totožností",
         "change_prompt": "Naozaj si želáte odpojiť od servera totožností <current /> a pripojiť sa namiesto toho k serveru <new />?",
-        "change_server_prompt": "Ak nechcete na vyhľadávanie kontaktov a možnosť byť nájdení používať <server />, zadajte adresu servera totožností nižšie.",
+        "change_server_prompt": "Ak nechcete používať <server /> na vyhľadávanie kontaktov a možnosť byť nájdený, zadajte adresu servera totožností nižšie.",
+        "changed": "Váš server totožnosti bol zmenený",
         "checking": "Kontrola servera",
-        "description_connected": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdení kontaktmi ktorých poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
+        "description_connected": "Momentálne na vyhľadávanie kontaktov a na možnosť byť nájdený kontaktmi, ktoré poznáte používate <server></server>. Zmeniť server totožností môžete nižšie.",
         "description_disconnected": "Momentálne nepoužívate žiaden server totožností. Ak chcete vyhľadávať kontakty a zároveň umožniť ostatným vašim kontaktom, aby mohli nájsť vás, nastavte si server totožností nižšie.",
         "description_optional": "Používanie servera totožností je voliteľné. Ak sa rozhodnete, že nebudete používať server totožností, nebudú vás vaši známi môcť nájsť a ani vy nebudete môcť pozývať používateľov zadaním emailovej adresy alebo telefónneho čísla.",
         "disconnect": "Odpojiť server totožností",
@@ -1166,10 +1293,24 @@
     "in_space1_and_space2": "V priestoroch %(space1Name)s a %(space2Name)s.",
     "in_space_and_n_other_spaces": {
         "one": "V %(spaceName)s a v %(count)s ďalšom priestore.",
+        "few": "V %(spaceName)s a %(count)s ďalších priestoroch.",
         "other": "V %(spaceName)s a %(count)s ďalších priestoroch."
     },
     "incompatible_browser": {
-        "title": "Nepodporovaný prehliadač"
+        "continue": "Napriek tomu pokračovať",
+        "description": "%(brand)s používa niektoré funkcie prehliadača, ktoré nie sú dostupné vo vašom aktuálnom prehliadači. %(detail)s",
+        "detail_can_continue": "Ak budete pokračovať, niektoré funkcie môžu prestať fungovať a existuje riziko, že v budúcnosti stratíte údaje.",
+        "detail_no_continue": "Skúste aktualizovať tento prehliadač, ak nepoužívate najnovšiu verziu, a skúste to znova.",
+        "learn_more": "Zistiť viac",
+        "linux": "Linux",
+        "macos": "Mac",
+        "supported_browsers": "Pre najlepší zážitok použite prehliadač <Firefox>Firefox</Firefox>, <Chrome>Chrome</Chrome>, <Edge>Edge</Edge> alebo <Safari>Safari</Safari>.",
+        "title": "Nepodporovaný prehliadač",
+        "use_desktop_heading": "Namiesto toho použite aplikáciu %(brand)s Desktop",
+        "use_mobile_heading": "Namiesto toho použite aplikáciu %(brand)s v mobile",
+        "use_mobile_heading_after_desktop": "Alebo použite našu mobilnú aplikáciu",
+        "windows_64bit": "Windows (64-bitový)",
+        "windows_arm_64bit": "Windows (ARM 64-bitový)"
     },
     "info_tooltip_title": "Informácie",
     "integration_manager": {
@@ -1178,6 +1319,7 @@
         "error_connecting_heading": "Nie je možné sa pripojiť k integračnému serveru",
         "explainer": "Správcovia integrácie dostávajú konfiguračné údaje a môžu vo vašom mene upravovať widgety, posielať pozvánky do miestnosti a nastavovať úrovne oprávnení.",
         "manage_title": "Spravovať integrácie",
+        "toggle_label": "Povoliť správcu integrácie",
         "use_im": "Na správu botov, widgetov a balíkov nálepiek použite správcu integrácie.",
         "use_im_default": "Na správu botov, widgetov a balíkov nálepiek použite správcu integrácie <b>(%(serverName)s)</b>."
     },
@@ -1244,12 +1386,14 @@
     },
     "inviting_user1_and_user2": "Pozývanie %(user1)s a %(user2)s",
     "inviting_user_and_n_others": {
-        "one": "Pozývanie %(user)s a 1 ďalšieho",
-        "other": "Pozývanie %(user)s a %(count)s ďalších"
+        "one": "Pozýva sa %(user)s a jeden ďalší",
+        "few": "Pozýva sa %(user)s a %(count)s ďalší",
+        "other": "Pozýva sa %(user)s a %(count)s ďalších"
     },
     "items_and_n_others": {
-        "other": "<Items/> a %(count)s ďalší",
-        "one": "<Items/> a jeden ďalší"
+        "one": "<Items/> a jeden ďalší",
+        "few": "<Items/> a %(count)s ďalšie",
+        "other": "<Items/> a %(count)s ďalší"
     },
     "keyboard": {
         "activate_button": "Aktivovať vybrané tlačidlo",
@@ -1293,12 +1437,14 @@
         "navigate_next_message_edit": "Prejsť na ďalšiu správu na úpravu",
         "navigate_prev_history": "Predchádzajúca nedávno navštívená miestnosť alebo priestor",
         "navigate_prev_message_edit": "Prejsť na predchádzajúcu správu na úpravu",
+        "next_landmark": "Prejdite na ďalší orientačný bod",
         "next_room": "Ďalšia miestnosť alebo správa",
         "next_unread_room": "Ďalšia neprečítaná miestnosť alebo správa",
         "number": "[číslo]",
         "open_user_settings": "Otvoriť používateľské nastavenia",
         "page_down": "Page Down",
         "page_up": "Page Up",
+        "prev_landmark": "Prejsť na predchádzajúci orientačný bod",
         "prev_room": "Predchádzajúca miestnosť alebo správa",
         "prev_unread_room": "Predchádzajúca neprečítaná miestnosť alebo správa",
         "room_list_collapse_section": "Zbaliť sekciu zoznamu miestností",
@@ -1343,8 +1489,11 @@
         "dynamic_room_predecessors": "Predchodcovia dynamickej miestnosti",
         "dynamic_room_predecessors_description": "Zapnúť MSC3946 (na podporu neskorých archívov miestností)",
         "element_call_video_rooms": "Element Call video miestnosti",
+        "exclude_insecure_devices": "Vylúčiť nezabezpečené zariadenia pri odosielaní/prijímaní správ",
+        "exclude_insecure_devices_description": "Ak je tento režim povolený, šifrované správy nebudú zdieľané s neoverenými zariadeniami a správy z neoverených zariadení sa zobrazia ako chyba. Upozorňujeme, že ak povolíte tento režim, možno nebudete môcť komunikovať s používateľmi, ktorí svoje zariadenia neoverili.",
         "experimental_description": "Chcete experimentovať? Vyskúšajte naše najnovšie nápady vo vývojovom štádiu. Tieto funkcie nie sú dokončené; môžu byť nestabilné, môžu sa zmeniť alebo môžu byť úplne zrušené. <a>Zistiť viac</a>.",
         "experimental_section": "Predbežné ukážky",
+        "extended_profiles_msc_support": "Vyžaduje, aby váš server podporoval MSC4133",
         "feature_disable_call_per_sender_encryption": "Zakázať šifrovanie pre jednotlivých odosielateľov pre Element Call",
         "feature_wysiwyg_composer_description": "Použiť rozšírený text namiesto Markdown v správach.",
         "group_calls": "Nový zážitok zo skupinových hovorov",
@@ -1357,6 +1506,8 @@
         "group_rooms": "Miestnosti",
         "group_spaces": "Priestory",
         "group_themes": "Vzhľad",
+        "group_threads": "Vlákna",
+        "group_ui": "Používateľské rozhranie",
         "group_voip": "Zvuk a video",
         "group_widgets": "Widgety",
         "hidebold": "Skryť oznamovaciu bodku (zobrazovať iba odznaky počítadiel)",
@@ -1372,10 +1523,12 @@
         "location_share_live_description": "Dočasná implementácia. Polohy ostávajú v histórii miestnosti.",
         "mjolnir": "Nové spôsoby ignorovania ľudí",
         "msc3531_hide_messages_pending_moderation": "Umožniť moderátorom skryť správy čakajúce na schválenie.",
+        "new_room_list": "Povoliť nový zoznam miestností",
         "notification_settings": "Nové nastavenia oznámení",
         "notification_settings_beta_caption": "Predstavujeme jednoduchší spôsob zmeny nastavení oznámení. Prispôsobte si svoju aplikáciu %(brand)s, presne podľa svojich predstáv.",
         "notification_settings_beta_title": "Nastavenia oznámení",
         "notifications": "Povolenie panelu oznámení v záhlaví miestnosti",
+        "release_announcement": "Oznámenie o vydaní",
         "render_reaction_images": "Vykresľovať vlastné obrázky v reakciách",
         "render_reaction_images_description": "Niekedy sa označujú ako „vlastné emotikony“.",
         "report_to_moderators": "Nahlásiť moderátorom",
@@ -1383,7 +1536,7 @@
         "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",
-        "sliding_sync_server_no_support": "Váš server nemá natívnu podporu",
+        "sliding_sync_server_no_support": "Váš server nemá podporu",
         "under_active_development": "V štádiu aktívneho vývoja.",
         "unrealiable_e2e": "Nespoľahlivé v šifrovaných miestnostiach",
         "video_rooms": "Video miestnosti",
@@ -1435,6 +1588,8 @@
         "last_person_warning": "Ste tu jediný človek. Ak odídete, nikto sa už v budúcnosti nebude môcť pripojiť do tejto miestnosti, vrátane vás.",
         "leave_room_question": "Ste si istí, že chcete opustiť miestnosť '%(roomName)s'?",
         "leave_space_question": "Ste si istí, že chcete opustiť priestor '%(spaceName)s'?",
+        "room_leave_admin_warning": "Ste jediný správca v tejto miestnosti. Ak odídete, nikto nebude môcť zmeniť nastavenia miestnosti alebo podniknúť ďalšie dôležité kroky.",
+        "room_leave_mod_warning": "Ste jediným moderátorom v tejto miestnosti. Ak odídete, nikto nebude môcť zmeniť nastavenia miestnosti alebo podniknúť ďalšie dôležité kroky.",
         "room_rejoin_warning": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
         "space_rejoin_warning": "Tento priestor nie je verejný. Bez pozvánky sa doň nebudete môcť opätovne pripojiť."
     },
@@ -1492,12 +1647,20 @@
         "toggle_attribution": "Prepínanie atribútu"
     },
     "member_list": {
+        "count": {
+            "one": "%(count)s člen",
+            "few": "%(count)s členovia",
+            "other": "%(count)s členov"
+        },
         "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)"
     },
     "member_list_back_action_label": "Členovia miestnosti",
     "message_edit_dialog_title": "Úpravy správy",
+    "migrating_crypto": "Ešte to vydržte. Aktualizujeme %(brand)s, aby bolo šifrovanie rýchlejšie a spoľahlivejšie.",
     "mobile_guide": {
         "toast_accept": "Použiť aplikáciu",
         "toast_description": "%(brand)s je v mobilnej verzii experimentálny. Ak chcete získať lepší zážitok a najnovšie funkcie, použite našu bezplatnú natívnu aplikáciu.",
@@ -1515,6 +1678,7 @@
         "class_global": "Celosystémové",
         "class_other": "Ďalšie",
         "default": "Predvolené",
+        "default_settings": "Zhoda s predvolenými nastaveniami",
         "email_pusher_app_display_name": "Emailové oznámenia",
         "enable_prompt_toast_description": "Povoliť oznámenia na ploche",
         "enable_prompt_toast_title": "Oznámenia",
@@ -1522,12 +1686,19 @@
         "error_change_title": "Upraviť nastavenia upozornení",
         "keyword": "Kľúčové slovo",
         "keyword_new": "Nové kľúčové slovo",
+        "level_activity": "Aktivita",
+        "level_highlight": "Zvýrazniť",
+        "level_muted": "Stlmené",
+        "level_none": "Žiadne",
+        "level_notification": "Oznámenie",
+        "level_unsent": "Neodoslané",
         "mark_all_read": "Označiť všetko ako prečítané",
         "mentions_and_keywords": "@zmienky a kľúčové slová",
         "mentions_and_keywords_description": "Dostávajte upozornenia len na zmienky a kľúčové slová nastavené vo vašich <a>nastaveniach</a>",
         "mentions_keywords": "Zmienky a kľúčové slová",
         "message_didnt_send": "Správa sa neodoslala. Kliknite pre informácie.",
-        "mute_description": "Nebudete dostávať žiadne oznámenia"
+        "mute_description": "Nebudete dostávať žiadne oznámenia",
+        "mute_room": "Stlmiť miestnosť"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s žiada o overenie"
@@ -1573,10 +1744,12 @@
         "total_decryption_errors": "Z dôvodu chýb v dešifrovaní sa niektoré hlasy nemusia započítať",
         "total_n_votes": {
             "one": "%(count)s odovzdaný hlas. Hlasujte a pozrite si výsledky",
+            "few": "%(count)s odovzdané hlasy. Hlasujte a pozrite si výsledky",
             "other": "%(count)s odovzdaných hlasov. Hlasujte a pozrite si výsledky"
         },
         "total_n_votes_voted": {
             "one": "Na základe %(count)s hlasu",
+            "few": "Na základe %(count)s hlasov",
             "other": "Na základe %(count)s hlasov"
         },
         "total_no_votes": "Žiadne odovzdané hlasy",
@@ -1629,11 +1802,6 @@
         "ongoing": "Odstraňovanie…",
         "reason_label": "Dôvod (voliteľný)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ste si istí, že chcete odmietnuť toto pozvanie?",
-        "failed": "Nepodarilo sa odmietnuť pozvanie",
-        "title": "Odmietnuť pozvanie"
-    },
     "report_content": {
         "description": "Nahlásenie tejto správy odošle jej jedinečné \"ID udalosti\" správcovi vášho domovského servera. Ak sú správy v tejto miestnosti zašifrované, správca domovského servera nebude môcť prečítať text správy ani zobraziť žiadne súbory alebo obrázky.",
         "disagree": "Nesúhlasím",
@@ -1656,54 +1824,87 @@
         "spam_or_propaganda": "Spam alebo propaganda",
         "toxic_behaviour": "Nebezpečné správanie"
     },
+    "report_room": {
+        "description": "Nahláste túto miestnosť poskytovateľovi účtu. Ak sú správy zašifrované, váš správca ich nebude môcť prečítať.",
+        "reason_label": "Popíšte dôvod"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Nepodarilo sa dešifrovať %(failedCount)s relácií!",
         "count_of_successfully_restored_keys": "Úspešne obnovených %(sessionCount)s kľúčov",
-        "enter_key_description": "Získajte prístup k histórii zabezpečených správ a nastavte bezpečné zasielanie správ zadaním bezpečnostného kľúča.",
-        "enter_key_title": "Zadajte bezpečnostný kľúč",
+        "enter_key_description": "Získajte prístup k histórii zabezpečených správ a nastavte bezpečné zasielanie správ zadaním kľúča na obnovenie.",
+        "enter_key_title": "Zadajte kľúč na obnovenie",
         "enter_phrase_description": "Získajte prístup k histórii zabezpečených správ a nastavte bezpečné zasielanie správ zadaním bezpečnostnej frázy.",
         "enter_phrase_title": "Zadať bezpečnostnú frázu",
         "incorrect_security_phrase_dialog": "Zálohovanie nebolo možné dešifrovať pomocou tejto bezpečnostnej frázy: overte, či ste zadali správnu bezpečnostnú frázu.",
         "incorrect_security_phrase_title": "Nesprávna bezpečnostná fráza",
         "key_backup_warning": "<b>Varovanie</b>: zálohovanie šifrovacích kľúčov by ste mali nastavovať na dôveryhodnom počítači.",
         "key_fetch_in_progress": "Získavanie kľúčov zo servera…",
-        "key_forgotten_text": "Ak ste zabudli bezpečnostný kľúč, môžete <button>nastaviť nové možnosti obnovenia</button>",
-        "key_is_invalid": "Neplatný bezpečnostný kľúč",
-        "key_is_valid": "Toto vyzerá ako platný bezpečnostný kľúč!",
+        "key_forgotten_text": "Ak ste zabudli kľúč na obnovenie, môžete <button>nastaviť nové možnosti obnovenia</button>",
+        "key_is_invalid": "Neplatný kľúč na obnovenie",
+        "key_is_valid": "Toto vyzerá ako platný kľúč na obnovenie",
         "keys_restored_title": "Kľúče obnovené",
         "load_error_content": "Nie je možné načítať stav zálohy",
         "load_keys_progress": "%(completed)s z %(total)s obnovených kľúčov",
         "no_backup_error": "Nebola nájdená žiadna záloha!",
-        "phrase_forgotten_text": "Ak ste zabudli svoju bezpečnostnú frázu, môžete <button1>použiť bezpečnostný kľúč</button1> alebo <button2>nastaviť nové možnosti obnovenia</button2>",
-        "recovery_key_mismatch_description": "Zálohovanie nebolo možné dešifrovať pomocou tohto bezpečnostného kľúča: overte, či ste zadali správny bezpečnostný kľúč.",
-        "recovery_key_mismatch_title": "Nezhoda bezpečnostných kľúčov",
+        "phrase_forgotten_text": "Ak ste zabudli svoju bezpečnostnú frázu, môžete <button1>použiť kľúč na obnovenie</button1> alebo <button2>nastaviť nové možnosti obnovenia</button2>",
+        "recovery_key_mismatch_description": "Zálohovanie nebolo možné dešifrovať pomocou tohto kľúča na obnovenie: overte, či ste zadali správny kľúč na obnovenie.",
+        "recovery_key_mismatch_title": "Nezhoda kľúča na obnovenie",
         "restore_failed_error": "Nie je možné obnoviť zo zálohy"
     },
     "right_panel": {
-        "add_integrations": "Pridať widgety, premostenia a boty",
+        "add_integrations": "Pridať rozšírenia",
+        "add_topic": "Pridať tému",
+        "extensions_button": "Rozšírenia",
+        "extensions_empty_description": "Vyberte možnosť „%(addIntegrations)s“ pre prehliadanie a pridanie rozšírení do tejto miestnosti",
+        "extensions_empty_title": "Zvýšte produktivitu pomocou ďalších nástrojov, widgetov a botov",
         "files_button": "Súbory",
         "pinned_messages": {
+            "empty_description": "Vyberte správu a vyberte \"%(pinAction)s\", aby ste ju sem pridali.",
+            "empty_title": "Pripnite dôležité správy, aby sa dali ľahko nájsť",
+            "header": {
+                "one": "1 pripnutá správa",
+                "few": "%(count)s pripnuté správy",
+                "other": "%(count)s pripnutých správ"
+            },
             "limits": {
+                "one": "Môžete pripnúť iba %(count)s widget",
+                "few": "Môžete pripnúť iba %(count)s widgety",
                 "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",
+                "content": "Uistite sa, že naozaj chcete odstrániť všetky pripnuté správy. Túto akciu nie je možné vrátiť späť.",
+                "title": "Zrušiť pripnutie všetkých správ?"
+            },
+            "view": "Zobraziť na časovej osi"
         },
-        "pinned_messages_button": "Pripnuté",
+        "pinned_messages_button": "Pripnuté správy",
         "poll": {
             "active_heading": "Aktívne ankety",
             "empty_active": "V tejto miestnosti nie sú žiadne aktívne ankety",
             "empty_active_load_more": "Nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
             "empty_active_load_more_n_days": {
                 "one": "Za uplynulý deň nie sú žiadne aktívne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
+                "few": "Za posledné %(count)s dni nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
                 "other": "Za posledných %(count)s dní nie sú aktívne žiadne ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace"
             },
             "empty_past": "V tejto miestnosti nie sú žiadne predchádzajúce ankety",
             "empty_past_load_more": "Nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
             "empty_past_load_more_n_days": {
                 "one": "Za posledný deň nie sú k dispozícii žiadne minulé ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
+                "few": "Za posledné %(count)s dni nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace",
                 "other": "Za posledných %(count)s dní nie sú žiadne predchádzajúce ankety. Načítaním ďalších ankiet zobrazíte ankety za predchádzajúce mesiace"
             },
             "final_result": {
                 "one": "Konečný výsledok na základe %(count)s hlasu",
+                "few": "Konečný výsledok na základe %(count)s hlasov",
                 "other": "Konečný výsledok na základe %(count)s hlasov"
             },
             "load_more": "Načítať ďalšie ankety",
@@ -1712,7 +1913,7 @@
             "view_in_timeline": "Zobraziť anketu na časovej osi",
             "view_poll": "Zobraziť anketu"
         },
-        "polls_button": "História ankety",
+        "polls_button": "Ankety",
         "room_summary_card": {
             "title": "Informácie o miestnosti"
         },
@@ -1741,6 +1942,7 @@
             "forget": "Zabudnúť miestnosť",
             "low_priority": "Nízka priorita",
             "mark_read": "Označiť ako prečítané",
+            "mark_unread": "Označiť ako neprečítané",
             "notifications_default": "Rovnaké ako predvolené nastavenie",
             "notifications_mute": "Stlmiť miestnosť",
             "title": "Možnosti miestnosti",
@@ -1771,10 +1973,12 @@
         "error_jump_to_date_title": "Nie je možné nájsť udalosť k danému dátumu",
         "face_pile_summary": {
             "one": "%(count)s človek, ktorého poznáte, sa už pripojil",
+            "few": "%(count)s ľudia, ktorých poznáte, sa už pripojili",
             "other": "%(count)s ľudí, ktorých poznáte, sa už pripojilo"
         },
         "face_pile_tooltip_label": {
             "one": "Zobraziť 1 člena",
+            "few": "Zobraziť všetkých %(count)s členov",
             "other": "Zobraziť všetkých %(count)s členov"
         },
         "face_pile_tooltip_shortcut": "Vrátane %(commaSeparatedMembers)s",
@@ -1790,6 +1994,8 @@
             },
             "room_is_public": "Táto miestnosť je verejná"
         },
+        "header_avatar_open_settings_label": "Otvoriť nastavenia miestnosti",
+        "header_face_pile_tooltip": "Ľudia",
         "header_untrusted_label": "Nedôveryhodný",
         "inaccessible": "Táto miestnosť alebo priestor nie je momentálne prístupná.",
         "inaccessible_name": "%(roomName)s nie je momentálne prístupná.",
@@ -1813,7 +2019,6 @@
             "you_created": "Túto miestnosť ste vytvorili vy."
         },
         "invite_email_mismatch_suggestion": "Ak chcete dostávať pozvánky priamo v %(brand)s, zdieľajte tento e-mail v Nastaveniach.",
-        "invite_reject_ignore": "Odmietnuť a ignorovať používateľa",
         "invite_sent_to_email": "Táto pozvánka bola odoslaná na %(email)s",
         "invite_sent_to_email_room": "Táto pozvánka do %(roomName)s bola odoslaná na %(email)s",
         "invite_subtitle": "<userName/> vás pozval/a",
@@ -1859,11 +2064,25 @@
         "not_found_title": "Táto miestnosť alebo priestor neexistuje.",
         "not_found_title_name": "%(roomName)s neexistuje.",
         "peek_join_prompt": "Zobrazujete náhľad %(roomName)s. Chcete sa k nej pripojiť?",
+        "pinned_message_badge": "Pripnutá správa",
+        "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.",
+            "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ť",
         "search": {
             "all_rooms_button": "Vyhľadávať vo všetkých miestnostiach",
+            "placeholder": "Hľadať správy…",
+            "summary": {
+                "one": "Našiel sa 1 výsledok pre \"<query/>\"",
+                "few": "Našli sa %(count)s výsledky pre \"<query/>\"",
+                "other": "Našlo sa %(count)s výsledkov pre \"<query/>\""
+            },
             "this_room_button": "Vyhľadávať v tejto miestnosti"
         },
         "status_bar": {
@@ -1881,6 +2100,7 @@
         "unknown_status_code_for_timeline_jump": "neznámy kód stavu",
         "unread_notifications_predecessor": {
             "one": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítané oznámenie.",
+            "few": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítané oznámenia.",
             "other": "V predchádzajúcej verzii tejto miestnosti máte %(count)s neprečítaných oznámení."
         },
         "upgrade_error_description": "Uistite sa, že domovský server podporuje zvolenú verziu miestnosti a skúste znovu.",
@@ -1891,11 +2111,13 @@
         "upgrade_warning_bar_upgraded": "Táto miestnosť už bola aktualizovaná.",
         "upload": {
             "uploading_multiple_file": {
-                "other": "Nahrávanie %(filename)s a %(count)s ďalších súborov",
-                "one": "Nahrávanie %(filename)s a %(count)s ďalší súbor"
+                "one": "Nahrávanie %(filename)s a %(count)s ďalší súbor",
+                "few": "Nahrávanie %(filename)s a %(count)s ďalšie súbory",
+                "other": "Nahrávanie %(filename)s a %(count)s ďalších súborov"
             },
             "uploading_single_file": "Nahrávanie %(filename)s"
         },
+        "video_room": "Táto miestnosť je video miestnosť",
         "waiting_for_join_subtitle": "Keď sa pozvaní používatelia pripoja k aplikácii %(brand)s, budete môcť konverzovať a miestnosť bude end-to-end šifrovaná",
         "waiting_for_join_title": "Čaká sa na používateľov, kým sa pripoja k aplikácii %(brand)s"
     },
@@ -1904,30 +2126,83 @@
         "add_space_label": "Pridať priestor",
         "breadcrumbs_empty": "Žiadne nedávno navštívené miestnosti",
         "breadcrumbs_label": "Nedávno navštívené miestnosti",
+        "empty": {
+            "no_chats": "Zatiaľ žiadne konverzácie",
+            "no_chats_description": "Začnite tým, že niekomu napíšete správu alebo vytvoríte miestnosť",
+            "no_chats_description_no_room_rights": "Začnite tým, že niekomu napíšete správu",
+            "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_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",
+            "no_rooms": "Zatiaľ ešte nie ste v žiadnej miestnosti",
+            "no_rooms_description": "Môžete zrušiť výber filtrov, aby ste videli svoje ostatné konverzácie",
+            "no_unread": "Gratulujeme! Nemáte žiadne neprečítané správy",
+            "show_activity": "Zobraziť všetku aktivitu",
+            "show_chats": "Zobraziť všetky konverzácie"
+        },
         "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",
+            "unread": "Neprečítané"
+        },
         "home_menu_label": "Možnosti domovskej obrazovky",
         "join_public_room_label": "Pripojiť sa k verejnej miestnosti",
         "joining_rooms_status": {
-            "other": "Momentálne ste pripojení k %(count)s miestnostiam",
-            "one": "Momentálne ste pripojení k %(count)s miestnosti"
+            "one": "Momentálne ste pripojení k %(count)s miestnosti",
+            "few": "Momentálne ste pripojení k %(count)s miestnostiam",
+            "other": "Momentálne ste pripojení k %(count)s miestnostiam"
+        },
+        "list_title": "Zoznam miestností",
+        "more_options": {
+            "copy_link": "Kopírovať odkaz na miestnosť",
+            "favourited": "Obľúbené",
+            "leave_room": "Opustiť miestnosť",
+            "low_priority": "Nízka priorita",
+            "mark_read": "Označiť ako prečítané",
+            "mark_unread": "Označiť ako neprečítané"
         },
         "notification_options": "Možnosti oznámenia",
+        "open_space_menu": "Otvoriť ponuku priestoru",
+        "primary_filters": "Filtre zoznamu miestností",
         "redacting_messages_status": {
             "one": "V súčasnosti sa odstraňujú správy v %(count)s miestnosti",
+            "few": "V súčasnosti sa odstraňujú správy v %(count)s miestnostiach",
             "other": "V súčasnosti sa odstraňujú správy v %(count)s miestnostiach"
         },
+        "room": {
+            "more_options": "Viac možností",
+            "open_room": "Otvoriť miestnosť %(roomName)s"
+        },
+        "room_options": "Možnosti miestnosti",
         "show_less": "Zobraziť menej",
         "show_n_more": {
-            "one": "Zobraziť %(count)s viac",
-            "other": "Zobraziť %(count)s viac"
+            "one": "Zobraziť %(count)s ďalšiu",
+            "few": "Zobraziť %(count)s ďalšie",
+            "other": "Zobraziť %(count)s ďalších"
         },
         "show_previews": "Zobraziť náhľady správ",
+        "sort": "Zoradiť",
         "sort_by": "Zoradiť podľa",
         "sort_by_activity": "Aktivity",
         "sort_by_alphabet": "A-Z",
+        "sort_type": {
+            "activity": "Aktivita",
+            "atoz": "A-Z"
+        },
         "sort_unread_first": "Najprv ukázať miestnosti s neprečítanými správami",
+        "space_menu": {
+            "home": "Domov priestoru",
+            "space_settings": "Nastavenia priestoru"
+        },
         "space_menu_label": "%(spaceName)s ponuka",
         "sublist_options": "Možnosti zoznamu",
         "suggested_rooms_heading": "Navrhované miestnosti"
@@ -1999,6 +2274,8 @@
             "error_deleting_alias_description": "Pri odstraňovaní tejto adresy došlo k chybe. Možno už neexistuje alebo došlo k dočasnej chybe.",
             "error_deleting_alias_description_forbidden": "Na vymazanie adresy nemáte povolenie.",
             "error_deleting_alias_title": "Chyba pri odstraňovaní adresy",
+            "error_publishing": "Nepodarilo sa zverejniť miestnosť",
+            "error_publishing_detail": "Vyskytla sa chyba pri zverejnení tejto miestnosti",
             "error_save_space_settings": "Nepodarilo sa uložiť nastavenia priestoru.",
             "error_updating_alias_description": "Pri aktualizácii alternatívnych adries miestnosti došlo k chybe. Nemusí to byť povolené serverom alebo došlo k dočasnému zlyhaniu.",
             "error_updating_canonical_alias_description": "Pri aktualizácii hlavnej adresy miestnosti došlo k chybe. Server to nemusí povoliť alebo došlo k dočasnému zlyhaniu.",
@@ -2136,6 +2413,7 @@
             },
             "join_rule_restricted_summary": {
                 "one": "V súčasnosti má priestor prístup",
+                "few": "V súčasnosti majú prístup %(count)s priestory",
                 "other": "V súčasnosti má prístup %(count)s priestorov"
             },
             "join_rule_restricted_upgrade_description": "Táto aktualizácia umožní členom vybraných priestorov prístup do tejto miestnosti bez pozvánky.",
@@ -2144,17 +2422,19 @@
             "join_rule_upgrade_required": "Vyžaduje sa aktualizácia",
             "join_rule_upgrade_sending_invites": {
                 "one": "Odosielanie pozvánky...",
+                "few": "Odosielanie pozvánok... (%(progress)s z %(count)s)",
                 "other": "Odosielanie pozvánok... (%(progress)s z %(count)s)"
             },
             "join_rule_upgrade_updating_spaces": {
                 "one": "Aktualizácia priestoru...",
+                "few": "Aktualizácia priestorov... (%(progress)s z %(count)s)",
                 "other": "Aktualizácia priestorov... (%(progress)s z %(count)s)"
             },
             "join_rule_upgrade_upgrading_room": "Aktualizácia miestnosti",
             "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í.",
-            "strict_encryption": "Nikdy neposielať šifrované správy neovereným reláciám v tejto miestnosti z tejto relácie",
+            "strict_encryption": "Posielať správy iba overeným používateľom.",
             "title": "Bezpečnosť a súkromie"
         },
         "title": "Nastavenia miestnosti - %(roomName)s",
@@ -2208,6 +2488,10 @@
         "recent_changes_heading": "Nedávne zmeny, ktoré ešte neboli prijaté",
         "title": "Server neodpovedá"
     },
+    "service_worker_error": {
+        "description": "%(brand)s vyžaduje proces služby na načítanie overených médií z úložísk obsahu Matrix. Váš prehliadač to nepodporuje, takže sa môže vyskytnúť zlyhanie načítania médií.",
+        "title": "Nepodarilo sa načítať proces služby"
+    },
     "seshat": {
         "error_initialising": "Inicializácia vyhľadávania správ zlyhala, pre viac informácií skontrolujte <a>svoje nastavenia</a>",
         "reset_button": "Obnoviť úložisko udalostí",
@@ -2225,6 +2509,7 @@
             "brand_version": "Verzia %(brand)s:",
             "clear_cache_reload": "Vymazať vyrovnávaciu pamäť a načítať znovu",
             "crypto_version": "Krypto verzia:",
+            "dialog_title": "<strong>Nastavenia: </strong> Pomocník a o aplikácii",
             "help_link": "Pomoc pri používaní %(brand)s môžete získať kliknutím <a>sem</a>.",
             "homeserver": "Domovský server je <code>%(homeserverUrl)s</code>",
             "identity_server": "Server identity je <code>%(identityServerUrl)s</code>",
@@ -2233,18 +2518,30 @@
         }
     },
     "settings": {
+        "account": {
+            "dialog_title": "<strong>Nastavenia:</strong> Účet",
+            "title": "Účet"
+        },
         "all_rooms_home": "Zobraziť všetky miestnosti v časti Domov",
         "all_rooms_home_description": "Všetky miestnosti, v ktorých sa nachádzate, sa zobrazia na domovskej obrazovke.",
         "always_show_message_timestamps": "Vždy zobrazovať časovú značku správ",
         "appearance": {
             "bundled_emoji_font": "Použiť pribalené písmo emotikonov",
+            "compact_layout": "Zobraziť kompaktný text a správy",
+            "compact_layout_description": "Na použitie tejto funkcie je potrebné zvoliť moderné rozloženie.",
             "custom_font": "Použiť systémové písmo",
             "custom_font_description": "Nastavte názov písma, ktoré máte nainštalované na vašom systéme & %(brand)s sa ho pokúsi použiť.",
-            "custom_font_name": "Meno systémového písma",
+            "custom_font_name": "Názov systémového písma",
             "custom_font_size": "Použiť vlastnú veľkosť",
-            "custom_theme_error_downloading": "Chyba pri stiahnutí informácií o vzhľade.",
+            "custom_theme_add": "Pridať vlastnú tému",
+            "custom_theme_downloading": "Sťahovanie vlastnej témy...",
+            "custom_theme_error_downloading": "Chyba pri sťahovaní témy",
+            "custom_theme_help": "Zadajte adresu URL vlastnej témy, ktorú chcete použiť.",
             "custom_theme_invalid": "Neplatná schéma vzhľadu.",
+            "dialog_title": "<strong>Nastavenia:</strong> Vzhľad",
             "font_size": "Veľkosť písma",
+            "font_size_default": "%(fontSize)s (predvolené)",
+            "high_contrast": "Vysoký kontrast",
             "image_size_default": "Predvolené",
             "image_size_large": "Veľký",
             "layout_bubbles": "Správy v bublinách",
@@ -2259,9 +2556,80 @@
         "code_block_expand_default": "Rozšíriť bloky kódu predvolene",
         "code_block_line_numbers": "Zobrazenie čísel riadkov v blokoch kódu",
         "disable_historical_profile": "Zobraziť aktuálny profilový obrázok a meno používateľov v histórii správ",
+        "discovery": {
+            "title": "Ako vás nájsť"
+        },
         "emoji_autocomplete": "Umožniť automatické návrhy emotikonov počas písania",
         "enable_markdown": "Povoliť funkciu Markdown",
         "enable_markdown_description": "Začnite správy s <code>/plain</code> na odoslanie bez použitia markdown.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Podrobnosti o vašom účte, kontakty, predvoľby a zoznam konverzácií sa zachovajú",
+                "breadcrumb_page": "Obnoviť šifrovanie",
+                "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_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ý.",
+                "details_title": "Podrobnosti o šifrovaní",
+                "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_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",
+                "reset_in_progress": "Prebieha obnovenie...",
+                "session_id": "ID relácie:",
+                "session_key": "Kľúč relácie:",
+                "title": "Pokročilé"
+            },
+            "confirm_key_storage_off": "Naozaj chcete ponechať úložisko kľúčov vypnuté?",
+            "confirm_key_storage_off_description": "Ak sa zo všetkých zariadení odhlásite, stratíte históriu správ a budete musieť znova overiť všetky existujúce kontakty. <a>Prečítajte si viac </a>",
+            "delete_key_storage": {
+                "breadcrumb_page": "Odstrániť úložisko kľúčov",
+                "confirm": "Odstrániť úložisko kľúčov",
+                "description": "Odstránením úložiska kľúčov sa odstráni vaša kryptografická identita a kľúče správ zo servera a vypnú sa nasledujúce bezpečnostné funkcie:",
+                "list_first": "Na nových zariadeniach nebudete mať zašifrovanú históriu správ",
+                "list_second": "Stratíte prístup k svojim zašifrovaným správam, ak sa odhlásite z aplikácie %(brand)s všade",
+                "title": "Naozaj chcete vypnúť úložisko kľúčov a odstrániť ho?"
+            },
+            "device_not_verified_button": "Overiť toto zariadenie",
+            "device_not_verified_description": "Ak chcete zobraziť nastavenia šifrovania, musíte toto zariadenie overiť.",
+            "device_not_verified_title": "Zariadenie nie je overené",
+            "dialog_title": "<strong>Nastavenia:</strong> Šifrovanie",
+            "key_storage": {
+                "allow_key_storage": "Povoliť úložisko kľúčov",
+                "description": "Uložte svoju kryptografickú totožnosť a kľúče správ bezpečne na serveri. To vám umožní zobraziť históriu správ na všetkých nových zariadeniach. <a>Zistiť viac</a>",
+                "title": "Úložisko kľúčov"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "Potvrdiť nový kľúč na obnovenie",
+                "change_recovery_confirm_description": "Dokončite zadaním nového kľúča na obnovenie nižšie. Váš starý už nebude fungovať.",
+                "change_recovery_confirm_title": "Zadajte svoj nový kľúč na obnovenie",
+                "change_recovery_key": "Zmeniť kľúč na obnovenie",
+                "change_recovery_key_description": "Zapíšte si tento nový kľúč na obnovenie niekde na bezpečné miesto. Potom kliknite na tlačidlo Pokračovať a potvrďte zmenu.",
+                "change_recovery_key_title": "Zmeniť kľúč na obnovenie?",
+                "description": "Ak ste stratili všetky existujúce zariadenia, obnovte svoju kryptografickú identitu a históriu správ pomocou kľúča na obnovenie.",
+                "enter_key_error": "Zadaný kľúč na obnovenie nie je správny.",
+                "enter_recovery_key": "Zadajte kľúč na obnovenie",
+                "forgot_recovery_key": "Zabudli ste kľúč na obnovenie?",
+                "key_storage_warning": "Vaše úložisko kľúčov nie je synchronizované. Kliknutím na tlačidlo nižšie vyriešite problém.",
+                "save_key_description": "Nezdieľajte ho s nikým!",
+                "save_key_title": "Kľúč na obnovenie",
+                "set_up_recovery": "Nastaviť obnovenie",
+                "set_up_recovery_confirm_button": "Dokončiť nastavenie",
+                "set_up_recovery_confirm_description": "Zadajte kľúč na obnovenie zobrazený na predchádzajúcej obrazovke a dokončite nastavenie obnovy.",
+                "set_up_recovery_confirm_title": "Na potvrdenie zadajte kľúč na obnovenie",
+                "set_up_recovery_description": "Vaše úložisko kľúčov je chránené kľúčom na obnovenie. Ak po nastavení potrebujete nový kľúč na obnovenie, môžete ho znova vytvoriť výberom „%(changeRecoveryKeyButton)s“.",
+                "set_up_recovery_save_key_description": "Zapíšte si tento kľúč na obnovenie na bezpečné miesto, napríklad do správcu hesiel, zašifrovanej poznámky alebo fyzického trezoru.",
+                "set_up_recovery_save_key_title": "Uložte kľúč na obnovenie na bezpečné miesto",
+                "set_up_recovery_secondary_description": "Po kliknutí na Pokračovať vám vygenerujeme kľúč na obnovenie.",
+                "title": "Obnovenie"
+            },
+            "title": "Šifrovanie"
+        },
         "general": {
             "account_management_section": "Správa účtu",
             "account_section": "Účet",
@@ -2274,6 +2642,14 @@
             "add_msisdn_dialog_title": "Pridať telefónne číslo",
             "add_msisdn_instructions": "SMSka vám bola zaslaná na +%(msisdn)s. Zadajte prosím overovací kód, ktorý obsahuje.",
             "add_msisdn_misconfigured": "Pridanie / prepojenie s MSISDN je nesprávne nakonfigurované",
+            "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_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.",
+            "avatar_upload_error_text_generic": "Formát súboru nemusí byť podporovaný.",
+            "avatar_upload_error_title": "Profilový obrázok sa nepodarilo nahrať",
             "confirm_adding_email_body": "Kliknutím na tlačidlo nižšie potvrdíte pridanie emailovej adresy.",
             "confirm_adding_email_title": "Potvrdiť pridanie emailu",
             "deactivate_confirm_body": "Ste si istí, že chcete deaktivovať svoje konto? Je to nezvratné.",
@@ -2289,10 +2665,14 @@
             "deactivate_confirm_erase_label": "Skryť moje správy pred novými členmi",
             "deactivate_section": "Deaktivovať účet",
             "deactivate_warning": "Deaktivácia účtu je trvalý úkon — buďte opatrní!",
-            "discovery_email_empty": "Možnosti nastavenia verejného profilu sa objavia po pridaní e-mailovej adresy vyššie.",
+            "discovery_email_empty": "Možnosti vyhľadávania kontaktov sa zobrazia po pridaní e-mailu.",
             "discovery_email_verification_instructions": "Overte odkaz vo vašej emailovej schránke",
-            "discovery_msisdn_empty": "Možnosti nastavenia verejného profilu sa objavia po pridaní telefónneho čísla vyššie.",
-            "discovery_needs_terms": "Súhlaste s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdení zadaním emailovej adresy alebo telefónneho čísla.",
+            "discovery_msisdn_empty": "Možnosti vyhľadávania kontaktov sa objavia po pridaní telefónneho čísla.",
+            "discovery_needs_terms": "Súhlaste s podmienkami používania servera totožností (%(serverName)s), aby ste mohli byť nájdený zadaním emailovej adresy alebo telefónneho čísla.",
+            "discovery_needs_terms_title": "Umožnite ľuďom, aby vás našli",
+            "display_name": "Zobrazované meno",
+            "display_name_error": "Nedá sa nastaviť zobrazované meno",
+            "email_adding_unsupported_by_hs": "Tento domovský server nepodporuje pridávanie e-mailových adries do vášho účtu.",
             "email_address_in_use": "Táto emailová adresa sa už používa",
             "email_address_label": "Emailová adresa",
             "email_not_verified": "Vaša emailová adresa nebola zatiaľ overená",
@@ -2317,7 +2697,9 @@
             "error_share_msisdn_discovery": "Nepodarilo sa zdieľanie telefónneho čísla",
             "identity_server_no_token": "Nenašiel sa prístupový token totožnosti",
             "identity_server_not_set": "Server totožnosti nie je nastavený",
-            "language_section": "Jazyk a región",
+            "invalid_phone_number": "Poskytnuté telefónne číslo sa nezdá byť platné.",
+            "language_section": "Jazyk",
+            "msisdn_adding_unsupported_by_hs": "Tento domovský server nepodporuje pridávanie telefónnych čísel do vášho účtu.",
             "msisdn_in_use": "Toto telefónne číslo sa už používa",
             "msisdn_label": "Telefónne číslo",
             "msisdn_verification_field_label": "Overovací kód",
@@ -2326,11 +2708,16 @@
             "oidc_manage_button": "Spravovať účet",
             "password_change_section": "Nastaviť nové heslo k účtu…",
             "password_change_success": "Vaše heslo bolo úspešne zmenené.",
+            "personal_info": "Osobné informácie",
+            "profile_subtitle": "Takto sa zobrazujete ostatným v aplikácii.",
+            "profile_subtitle_oidc": "Váš účet spravuje oddelene poskytovateľ identity, takže niektoré z vašich osobných údajov tu nie je možné zmeniť.",
             "remove_email_prompt": "Odstrániť adresu %(email)s?",
             "remove_msisdn_prompt": "Odstrániť číslo %(phone)s?",
-            "spell_check_locale_placeholder": "Vyberte si jazyk"
+            "spell_check_locale_placeholder": "Vyberte si jazyk",
+            "unable_to_load_emails": "Nepodarilo sa načítať e-mailové adresy",
+            "unable_to_load_msisdns": "Nie je možné načítať telefónne čísla",
+            "username": "Používateľské meno"
         },
-        "image_thumbnails": "Zobrazovať ukážky/náhľady obrázkov",
         "inline_url_previews_default": "Predvolene povoliť náhľady URL adries",
         "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)",
@@ -2352,21 +2739,21 @@
                 "enter_phrase_description": "Zadajte bezpečnostnú frázu, ktorú poznáte len vy, keďže sa používa na ochranu vašich údajov. V záujme bezpečnosti by ste nemali heslo k účtu používať opakovane.",
                 "enter_phrase_title": "Zadajte bezpečnostnú frázu",
                 "enter_phrase_to_confirm": "Zadajte svoju bezpečnostnú frázu znova, aby ste ju potvrdili.",
-                "generate_security_key_description": "Vygenerujeme vám bezpečnostný kľúč, ktorý si uložte na bezpečné miesto, napríklad do správcu hesiel alebo do trezoru.",
-                "generate_security_key_title": "Vygenerovať bezpečnostný kľúč",
+                "generate_security_key_description": "Vygenerujeme vám kľúč na obnovenie, ktorý si uložte na bezpečné miesto, napríklad do správcu hesiel alebo do trezoru.",
+                "generate_security_key_title": "Vygenerovať kľúč na obnovenie",
                 "pass_phrase_match_failed": "To sa nezhoduje.",
                 "pass_phrase_match_success": "Zhoda!",
                 "phrase_strong_enough": "Skvelé! Táto bezpečnostná fráza vyzerá dostatočne silná.",
                 "secret_storage_query_failure": "Nie je možné vykonať dopyt na stav tajného úložiska",
-                "security_key_safety_reminder": "Bezpečnostný kľúč uložte na bezpečné miesto, napríklad do správcu hesiel alebo trezora, pretože slúži na ochranu zašifrovaných údajov.",
+                "security_key_safety_reminder": "Kľúč na obnovenie uložte na bezpečné miesto, napríklad do správcu hesiel alebo trezora, pretože slúži na ochranu zašifrovaných údajov.",
                 "set_phrase_again": "Vráťte sa späť a nastavte to znovu.",
                 "settings_reminder": "Bezpečné zálohovanie a správu kľúčov môžete nastaviť aj v Nastaveniach.",
                 "title_confirm_phrase": "Potvrdiť bezpečnostnú frázu",
-                "title_save_key": "Uložte svoj bezpečnostný kľúč",
+                "title_save_key": "Uložte si svoj kľúč na obnovenie",
                 "title_set_phrase": "Nastaviť bezpečnostnú frázu",
                 "unable_to_setup": "Nie je možné nastaviť tajné úložisko",
                 "use_different_passphrase": "Použiť inú prístupovú frázu?",
-                "use_phrase_only_you_know": "Použite tajnú frázu, ktorú poznáte len vy, a prípadne uložte si bezpečnostný kľúč, ktorý môžete použiť na zálohovanie."
+                "use_phrase_only_you_know": "Použite tajnú frázu, ktorú poznáte len vy, a prípadne si uložte kľúč na obnovenie, ktorý môžete použiť na zálohovanie."
             }
         },
         "key_export_import": {
@@ -2384,13 +2771,29 @@
             "phrase_strong_enough": "Skvelé! Táto bezpečnostná fráza vyzerá dostatočne silná"
         },
         "keyboard": {
+            "dialog_title": "<strong>Nastavenia:</strong> Klávesnica",
             "title": "Klávesnica"
         },
+        "labs": {
+            "dialog_title": "<strong>Nastavenia:</strong> Laboratóriá"
+        },
+        "labs_mjolnir": {
+            "dialog_title": "<strong>Nastavenia:</strong> Ignorovaní používatelia"
+        },
+        "media_preview": {
+            "hide_avatars": "Skryť obrázky miestnosti a pozývateľa",
+            "hide_media": "Vždy skryť",
+            "media_preview_description": "Skryté médium sa dá vždy zobraziť ťuknutím naň",
+            "media_preview_label": "Zobraziť médiá na časovej osi",
+            "show_in_private": "V súkromných miestnostiach",
+            "show_media": "Vždy zobraziť"
+        },
         "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)",
+            "default_setting_section": "Chcem byť upozornený na (predvolené nastavenie)",
             "desktop_notification_message_preview": "Zobraziť náhľad správy v oznámení na pracovnej ploche",
-            "email_description": "Prijímajte e-mailový súhrn zmeškaných oznámení",
+            "dialog_title": "<strong>Nastavenia:</strong> Oznámenia",
+            "email_description": "Dostávajte emailový súhrn o zmeškaných oznámeniach",
             "email_section": "Emailový súhrn",
             "email_select": "Vyberte e-maily, na ktoré chcete odosielať súhrny. Spravujte svoje e-maily v <button>Všeobecných nastaveniach</button>.",
             "enable_audible_notifications_session": "Povoliť zvukové oznámenia pre túto reláciu",
@@ -2426,7 +2829,7 @@
             "quick_actions_mark_all_read": "Označiť všetky správy ako prečítané",
             "quick_actions_reset": "Obnoviť predvolené nastavenia",
             "quick_actions_section": "Rýchle akcie",
-            "room_activity": "Objavujú sa nové aktivity v miestnosti, aktualizácie a správy o stave",
+            "room_activity": "Keď sa vyskytnú nové aktivity v miestnosti, aktualizácie a správy o stave",
             "rule_call": "Pozvánka na telefonát",
             "rule_contains_display_name": "Správy obsahujúce moje zobrazované meno",
             "rule_contains_user_name": "Správy obsahujúce moje meno používateľa",
@@ -2448,12 +2851,15 @@
             "code_blocks_heading": "Bloky kódu",
             "compact_modern": "Použiť kompaktnejšie \"moderné\" usporiadanie",
             "composer_heading": "Písanie správ",
+            "default_timezone": "Predvolená (%(timezone)s) prehliadača",
+            "dialog_title": "<strong>Nastavenia:</strong> Predvoľby",
             "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",
             "keyboard_view_shortcuts_button": "Ak chcete zobraziť všetky klávesové skratky, <a>kliknite sem</a>.",
             "media_heading": "Obrázky, GIF animácie a videá",
             "presence_description": "Zdieľajte svoju aktivitu a stav s ostatnými.",
+            "publish_timezone": "Zverejniť časové pásmo na verejnom profile",
             "rm_lifetime": "Platnosť značky Prečítané (ms)",
             "rm_lifetime_offscreen": "Platnosť značky Prečítané mimo obrazovku (ms)",
             "room_directory_heading": "Adresár miestností",
@@ -2461,59 +2867,26 @@
             "show_avatars_pills": "Zobraziť obrázky profilov v zmienkach o používateľoch, miestnostiach a udalostiach",
             "show_polls_button": "Zobraziť tlačidlo ankiet",
             "surround_text": "Obklopiť vybraný text pri písaní špeciálnych znakov",
-            "time_heading": "Zobrazovanie času"
+            "time_heading": "Zobrazovanie času",
+            "user_timezone": "Nastaviť časové pásmo"
         },
         "prompt_invite": "Upozorniť pred odoslaním pozvánok na potenciálne neplatné Matrix ID",
         "replace_plain_emoji": "Automaticky nahrádzať textové emotikony modernými",
         "security": {
-            "4s_public_key_in_account_data": "v údajoch účtu",
-            "4s_public_key_status": "Verejný kľúč bezpečného úložiska:",
             "analytics_description": "Zdieľajte anonymné údaje, ktoré nám pomôžu identifikovať problémy. Nič osobné. Žiadne tretie strany.",
-            "backup_key_cached_status": "Záložný kľúč v medzipamäti:",
-            "backup_key_stored_status": "Záložný kľúč uložený:",
-            "backup_key_unexpected_type": "neočakávaný typ",
-            "backup_key_well_formed": "správne vytvorené",
-            "backup_keys_description": "Zálohujte si šifrovacie kľúče s údajmi o účte pre prípad, že stratíte prístup k reláciám. Vaše kľúče budú zabezpečené jedinečným bezpečnostným kľúčom.",
             "bulk_options_accept_all_invites": "Prijať všetkých %(invitedRooms)s pozvaní",
             "bulk_options_reject_all_invites": "Odmietnuť všetky %(invitedRooms)s pozvania",
             "bulk_options_section": "Hromadné možnosti",
-            "cross_signing_cached": "uložené do lokálnej vyrovnávacej pamäte",
-            "cross_signing_homeserver_support": "Funkcie podporované domovským serverom:",
-            "cross_signing_homeserver_support_exists": "existuje",
-            "cross_signing_in_4s": "na bezpečnom úložisku",
-            "cross_signing_in_memory": "v pamäti",
-            "cross_signing_master_private_Key": "Hlavný súkromný kľúč:",
-            "cross_signing_not_cached": "nenájdené lokálne",
-            "cross_signing_not_found": "nenájdené",
-            "cross_signing_not_in_4s": "sa nenašiel v úložisku",
-            "cross_signing_not_stored": "neuložené",
-            "cross_signing_private_keys": "Súkromné kľúče krížového podpisovania:",
-            "cross_signing_public_keys": "Verejné kľúče krížového podpisovania:",
-            "cross_signing_self_signing_private_key": "Samopodpisujúci súkromný kľúč:",
-            "cross_signing_user_signing_private_key": "Súkromný podpisový kľúč používateľa:",
-            "cryptography_section": "Kryptografia",
-            "delete_backup": "Vymazať zálohu",
-            "delete_backup_confirm_description": "Ste si istí? Ak nemáte správne zálohované šifrovacie kľúče, prídete o históriu šifrovaných konverzácií.",
+            "dehydrated_device_description": "Funkcia offline zariadenia vám umožňuje prijímať šifrované správy, aj keď nie ste prihlásení do žiadneho zariadenia",
+            "dehydrated_device_enabled": "Funkcia offline zariadenia je povolená",
+            "dialog_title": "<strong>Nastavenia:</strong> Bezpečnosť a súkromie",
             "e2ee_default_disabled_warning": "Správca vášho servera predvolene vypol end-to-end šifrovanie v súkromných miestnostiach a v priamych správach.",
             "enable_message_search": "Povoliť vyhľadávanie správ v šifrovaných miestnostiach",
             "encryption_section": "Šifrovanie",
-            "error_loading_key_backup_status": "Nie je možné načítať stav zálohy kľúčov",
-            "export_megolm_keys": "Exportovať end-to-end šifrovacie kľúče miestnosti",
             "ignore_users_empty": "Nemáte žiadnych ignorovaných používateľov.",
             "ignore_users_section": "Ignorovaní používatelia",
-            "import_megolm_keys": "Importovať end-to-end šifrovacie kľúče miestnosti",
-            "key_backup_active": "Táto relácia zálohuje vaše kľúče.",
-            "key_backup_active_version": "Verzia aktívnej zálohy:",
-            "key_backup_active_version_none": "Žiadne",
             "key_backup_algorithm": "Algoritmus:",
-            "key_backup_can_be_restored": "Túto zálohu je možné obnoviť v tejto relácii",
-            "key_backup_complete": "Všetky kľúče sú zálohované",
             "key_backup_connect": "Pripojiť túto reláciu k Zálohe kľúčov",
-            "key_backup_connect_prompt": "Pred odhlásením pripojte túto reláciu k zálohe kľúčov, aby ste predišli strate kľúčov, ktoré môžu byť len v tejto relácii.",
-            "key_backup_in_progress": "Zálohovanie %(sessionsRemaining)s kľúčov…",
-            "key_backup_inactive": "Táto relácia <b>nezálohuje vaše kľúče</b>, ale máte jednu existujúcu zálohu, ktorú môžete obnoviť a pridať do budúcnosti.",
-            "key_backup_inactive_warning": "Vaše kľúče <b>nie sú zálohované z tejto relácie</b>.",
-            "key_backup_latest_version": "Najnovšia verzia zálohy na serveri:",
             "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": {
@@ -2533,14 +2906,8 @@
             "message_search_unsupported": "%(brand)su chýbajú niektoré komponenty potrebné na bezpečné cachovanie šifrovaných správ lokálne. Pokiaľ chcete experimentovať s touto funkciou, spravte si svoj vlastný %(brand)s Desktop s <nativeLink>pridanými vyhľadávacími komponentami</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s nedokáže bezpečne lokálne ukladať do vyrovnávacej pamäte zašifrované správy, keď je spustený vo webovom prehliadači. Na zobrazenie šifrovaných správ vo výsledkoch vyhľadávania použite <desktopLink>%(brand)s Desktop</desktopLink>.",
             "record_session_details": "Zaznamenať názov klienta, verziu a url, aby bolo možné ľahšie rozpoznať relácie v správcovi relácií",
-            "restore_key_backup": "Obnoviť zo zálohy",
-            "secret_storage_not_ready": "nie je pripravené",
-            "secret_storage_ready": "pripravené",
-            "secret_storage_status": "Tajné úložisko:",
             "send_analytics": "Odosielať analytické údaje",
-            "session_id": "ID relácie:",
-            "session_key": "Kľúč relácie:",
-            "strict_encryption": "Nikdy neposielať šifrované správy neovereným reláciám z tejto relácie"
+            "strict_encryption": "Posielať správy iba overeným používateľom"
         },
         "send_read_receipts": "Odosielať potvrdenia o prečítaní",
         "send_read_receipts_unsupported": "Váš server nepodporuje vypnutie odosielania potvrdení o prečítaní.",
@@ -2571,6 +2938,7 @@
             "device_unverified_description_current": "Overte svoju aktuálnu reláciu pre vylepšené bezpečné zasielanie správ.",
             "device_verified_description": "Táto relácia je pripravená na bezpečné zasielanie správ.",
             "device_verified_description_current": "Vaša aktuálna relácia je pripravená na bezpečné zasielanie správ.",
+            "dialog_title": "<strong>Nastavenia:</strong> Relácie",
             "error_pusher_state": "Nepodarilo sa nastaviť stav push oznámení",
             "error_set_name": "Nepodarilo sa nastaviť názov relácie",
             "filter_all": "Všetky",
@@ -2587,9 +2955,11 @@
             "inactive_sessions_list_description": "Zvážte odhlásenie zo starých relácií (%(inactiveAgeDays)s dní alebo starších), ktoré už nepoužívate.",
             "ip": "IP adresa",
             "last_activity": "Posledná aktivita",
+            "manage": "Spravovať túto reláciu",
             "mobile_session": "Relácia na mobile",
             "n_sessions_selected": {
                 "one": "%(count)s vybraná relácia",
+                "few": "%(count)s vybrané relácie",
                 "other": "%(count)s vybraných relácií"
             },
             "no_inactive_sessions": "Nenašli sa žiadne neaktívne relácie.",
@@ -2610,17 +2980,20 @@
             "security_recommendations_description": "Zlepšite zabezpečenie svojho účtu dodržiavaním týchto odporúčaní.",
             "session_id": "ID relácie",
             "show_details": "Zobraziť podrobnosti",
-            "sign_in_with_qr": "Prihlásiť sa pomocou QR kódu",
+            "sign_in_with_qr": "Prepojiť nové zariadenie",
             "sign_in_with_qr_button": "Zobraziť QR kód",
-            "sign_in_with_qr_description": "Toto zariadenie môžete použiť na prihlásenie nového zariadenia pomocou QR kódu. QR kód zobrazený na tomto zariadení musíte naskenovať pomocou zariadenia, ktoré je odhlásené.",
+            "sign_in_with_qr_description": "Pomocou QR kódu sa prihláste do druhého zariadenia a nastavte zabezpečené správy.",
+            "sign_in_with_qr_unsupported": "Nie je podporovaný poskytovateľom vášho účtu",
             "sign_out": "Odhlásiť sa z tejto relácie",
             "sign_out_all_other_sessions": "Odhlásiť sa zo všetkých ostatných relácií (%(otherSessionsCount)s)",
             "sign_out_confirm_description": {
                 "one": "Ste si istí, že sa chcete odhlásiť z %(count)s relácie?",
+                "few": "Ste si istí, že sa chcete odhlásiť z %(count)s relácií?",
                 "other": "Ste si istí, že sa chcete odhlásiť z %(count)s relácií?"
             },
             "sign_out_n_sessions": {
                 "one": "Odhlásiť sa z %(count)s relácie",
+                "few": "Odhlásiť sa z %(count)s relácií",
                 "other": "Odhlásiť sa z %(count)s relácií"
             },
             "title": "Relácie",
@@ -2652,7 +3025,9 @@
         "show_redaction_placeholder": "Zobrazovať náhrady za odstránené správy",
         "show_stickers_button": "Zobraziť tlačidlo nálepiek",
         "show_typing_notifications": "Zobrazovať oznámenia, keď ostatní používatelia píšu",
+        "showbold": "Zobraziť všetku aktivitu v zozname miestností (bodky alebo počet neprečítaných správ)",
         "sidebar": {
+            "dialog_title": "<strong>Nastavenia:</strong> Bočný panel",
             "metaspaces_favourites_description": "Zoskupte všetky vaše obľúbené miestnosti a ľudí na jednom mieste.",
             "metaspaces_home_all_rooms": "Zobraziť všetky miestnosti",
             "metaspaces_home_all_rooms_description": "Zobrazte všetky miestnosti v časti Domov, aj keď sú v priestore.",
@@ -2661,10 +3036,14 @@
             "metaspaces_orphans_description": "Zoskupte všetky miestnosti, ktoré nie sú súčasťou priestoru, na jednom mieste.",
             "metaspaces_people_description": "Zoskupte všetkých ľudí na jednom mieste.",
             "metaspaces_subsection": "Priestory na zobrazenie",
+            "metaspaces_video_rooms": "Video miestnosti a konferencie",
+            "metaspaces_video_rooms_description": "Zoskupte všetky súkromné video miestnosti a konferencie.",
+            "metaspaces_video_rooms_description_invite_extension": "Na konferencie môžete pozývať ľudí aj mimo siete matrix.",
             "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",
+        "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",
         "use_command_f_search": "Na vyhľadávanie na časovej osi použite klávesovú skratku Command + F",
@@ -2678,6 +3057,7 @@
             "audio_output_empty": "Neboli rozpoznané žiadne zariadenia pre výstup zvuku",
             "auto_gain_control": "Automatické riadenie zosilnenia",
             "connection_section": "Pripojenie",
+            "dialog_title": "<strong>Nastavenia:</strong> Hlas a video",
             "echo_cancellation": "Potlačenie ozveny",
             "enable_fallback_ice_server": "Povoliť náhradnú službu hovorov asistenčného servera (%(server)s)",
             "enable_fallback_ice_server_description": "Platí len v prípade, ak váš domovský server takúto možnosť neponúka. Vaša IP adresa bude počas hovoru zdieľaná.",
@@ -2696,8 +3076,12 @@
         "warning": "<w>UPOZORNENIE:</w> <description/>"
     },
     "share": {
+        "link_copied": "Odkaz skopírovaný",
         "permalink_message": "Odkaz na vybratú správu",
         "permalink_most_recent": "Odkaz na najnovšiu správu",
+        "share_call": "Odkaz na pozvánku na konferenciu",
+        "share_call_subtitle": "Odkaz pre externých používateľov na pripojenie k hovoru bez matrix účtu:",
+        "title_link": "Zdieľať odkaz",
         "title_message": "Zdieľať správu z miestnosti",
         "title_room": "Zdieľať miestnosť",
         "title_user": "Zdieľať používateľa"
@@ -2768,8 +3152,6 @@
         "topic": "Zobrazí alebo nastaví tému miestnosti",
         "topic_none": "Táto miestnosť nemá nastavenú tému.",
         "topic_room_error": "Nepodarilo sa získať tému miestnosti: Nepodarilo sa nájsť miestnosť (%(roomId)s",
-        "tovirtual": "Prepne do virtuálnej miestnosti tejto miestnosti, ak ju má",
-        "tovirtual_not_found": "Žiadna virtuálna miestnosť pre túto miestnosť",
         "unban": "Zruší zákaz vstúpiť používateľovi so zadaným ID",
         "unflip": "Pridá znaky ┬──┬ ノ( ゜-゜ノ) pred správy vo formáte obyčajného textu",
         "unholdcall": "Zruší podržanie hovoru v aktuálnej miestnosti",
@@ -2787,6 +3169,7 @@
         "view": "Zobrazí miestnosti s danou adresou",
         "whois": "Zobrazuje informácie o používateľovi"
     },
+    "sliding_sync_legacy_no_longer_supported": "Starší režim kĺzavej synchronizácie už nie je podporovaný: odhláste sa a znova sa prihláste, aby ste povolili nový príznak kĺzavej synchronizácie",
     "space": {
         "add_existing_room_space": {
             "create": "Chcete namiesto toho pridať novú miestnosť?",
@@ -2794,8 +3177,9 @@
             "dm_heading": "Priame správy",
             "error_heading": "Neboli pridané všetky vybrané",
             "progress_text": {
-                "other": "Pridávanie miestností... (%(progress)s z %(count)s)",
-                "one": "Pridávanie miestnosti..."
+                "one": "Pridávanie miestnosti...",
+                "few": "Pridávanie miestností... (%(progress)s z %(count)s)",
+                "other": "Pridávanie miestností... (%(progress)s z %(count)s)"
             },
             "space_dropdown_label": "Výber priestoru",
             "space_dropdown_title": "Pridať existujúce miestnosti",
@@ -2880,8 +3264,9 @@
         "cant_find_room_helpful_hint": "Ak nemôžete nájsť hľadanú miestnosť, požiadajte o pozvánku alebo vytvorte novú miestnosť.",
         "copy_link_text": "Kopírovať odkaz na pozvánku",
         "count_of_members": {
-            "other": "%(count)s členov",
-            "one": "%(count)s člen"
+            "one": "%(count)s člen",
+            "few": "%(count)s členovia",
+            "other": "%(count)s členov"
         },
         "create_new_room_button": "Vytvoriť novú miestnosť",
         "failed_querying_public_rooms": "Nepodarilo sa vyhľadať verejné miestnosti",
@@ -2891,7 +3276,7 @@
         "heading_without_query": "Hľadať",
         "join_button_text": "Pripojiť sa k %(roomAddress)s",
         "keyboard_scroll_hint": "Na posúvanie použite <arrows/>",
-        "message_search_section_title": "Iné vyhľadávania",
+        "messages_label": "Správy",
         "other_rooms_in_space": "Ostatné miestnosti v %(spaceName)s",
         "public_rooms_label": "Verejné miestnosti",
         "public_spaces_label": "Verejné priestory",
@@ -2901,7 +3286,6 @@
         "result_may_be_hidden_privacy_warning": "Niektoré výsledky môžu byť skryté kvôli ochrane súkromia",
         "result_may_be_hidden_warning": "Niektoré výsledky môžu byť skryté",
         "search_dialog": "Vyhľadávacie dialógové okno",
-        "search_messages_hint": "Ak chcete vyhľadávať správy, nájdite túto ikonu v hornej časti miestnosti <icon/>",
         "spaces_title": "Priestory, v ktorých sa nachádzate",
         "start_group_chat_button": "Začať skupinovú konverzáciu"
     },
@@ -2928,7 +3312,7 @@
     },
     "theme": {
         "light_high_contrast": "Ľahký vysoký kontrast",
-        "match_system": "Zhoda so systémom"
+        "match_system": "Prispôsobiť systému"
     },
     "thread_view_back_action_label": "Späť na vlákno",
     "threads": {
@@ -2936,14 +3320,23 @@
         "all_threads_description": "Zobrazí všetky vlákna z aktuálnej miestnosti",
         "count_of_reply": {
             "one": "%(count)s odpoveď",
+            "few": "%(count)s odpovede",
             "other": "%(count)s odpovedí"
         },
+        "empty_description": "Použite „%(replyInThread)s“, keď umiestnite kurzor myši nad správu.",
+        "empty_title": "Vlákna pomáhajú udržiavať vaše konverzácie k téme a ľahko sledovateľné.",
         "error_start_thread_existing_relation": "Nie je možné vytvoriť vlákno z udalosti s existujúcim vzťahom",
+        "mark_all_read": "Označiť všetko ako prečítané",
         "my_threads": "Moje vlákna",
         "my_threads_description": "Zobrazí všetky vlákna, v ktorých ste sa zúčastnili",
         "open_thread": "Otvoriť vlákno",
         "show_thread_filter": "Zobraziť:"
     },
+    "threads_activity_centre": {
+        "header": "Aktivita vlákien",
+        "no_rooms_with_threads_notifs": "Zatiaľ nemáte miestnosti s upozorneniami na vlákna.",
+        "no_rooms_with_unread_threads": "Zatiaľ nemáte miestnosti s neprečítanými vláknami."
+    },
     "time": {
         "about_day_ago": "asi pred jedným dňom",
         "about_hour_ago": "približne pred hodinou",
@@ -2985,9 +3378,21 @@
         },
         "creation_summary_dm": "%(creator)s vytvoril/a túto priamu správu.",
         "creation_summary_room": "%(creator)s vytvoril a nastavil miestnosť.",
+        "decryption_failure": {
+            "blocked": "Odosielateľ vám zablokoval prijímanie tejto správy, pretože vaše zariadenie nie je overené",
+            "historical_event_no_key_backup": "Staré správy nie sú na tomto zariadení k dispozícii",
+            "historical_event_unverified_device": "Musíte overiť toto zariadenie pre prístup k starším správam",
+            "historical_event_user_not_joined": "K tejto správe nemáte prístup",
+            "sender_identity_previously_verified": "Overená totožnosť odosielateľa sa zmenila",
+            "sender_unsigned_device": "Odoslané z nezabezpečeného zariadenia.",
+            "unable_to_decrypt": "Správu sa nepodarilo dešifrovať"
+        },
         "disambiguated_profile": "%(displayName)s (%(matrixId)s)",
         "download_action_decrypting": "Dešifrovanie",
         "download_action_downloading": "Preberanie",
+        "download_failed": "Sťahovanie zlyhalo",
+        "download_failed_description": "Pri sťahovaní tohto súboru sa vyskytla chyba",
+        "e2e_state": "Stav end-to-end šifrovania",
         "edits": {
             "tooltip_label": "Upravené %(date)s. Kliknutím zobrazíte úpravy.",
             "tooltip_sub": "Kliknutím zobrazíte úpravy",
@@ -3041,7 +3446,7 @@
         },
         "m.file": {
             "error_decrypting": "Chyba pri dešifrovaní prílohy",
-            "error_invalid": "Neplatný súbor%(extra)s"
+            "error_invalid": "Neplatný súbor"
         },
         "m.image": {
             "error": "Nie je možné zobraziť obrázok kvôli chybe",
@@ -3062,6 +3467,7 @@
         "m.poll": {
             "count_of_votes": {
                 "one": "%(count)s hlas",
+                "few": "%(count)s hlasy",
                 "other": "%(count)s hlasov"
             }
         },
@@ -3142,6 +3548,7 @@
             "left_reason": "%(targetName)s opustil/a miestnosť: %(reason)s",
             "no_change": "%(senderName)s neurobil žiadne zmeny",
             "reject_invite": "%(targetName)s odmietol/a pozvánku",
+            "reject_invite_reason": "%(targetName)s odmietol/a pozvanie: %(reason)s",
             "remove_avatar": "%(senderName)s odstránil/a svoj profilový obrázok",
             "remove_name": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s)",
             "set_avatar": "%(senderName)s nastavil/a svoj profilový obrázok",
@@ -3178,11 +3585,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s aktualizoval túto miestnosť.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s zmenil tému na \"%(topic)s\"."
+            "changed": "%(senderDisplayName)s zmenil tému na \"%(topic)s\".",
+            "removed": "%(senderDisplayName)s odstránil/a tému."
         },
         "m.sticker": "%(senderDisplayName)s poslal nálepku.",
         "m.video": {
-            "error_decrypting": "Chyba pri dešifrovaní videa"
+            "error_decrypting": "Chyba pri dešifrovaní videa",
+            "show_video": "Zobraziť video"
         },
         "m.widget": {
             "added": "%(senderName)s pridal widget %(widgetName)s",
@@ -3230,10 +3639,12 @@
         "reactions": {
             "add_reaction_prompt": "Pridať reakciu",
             "custom_reaction_fallback_label": "Vlastná reakcia",
-            "label": "%(reactors)s reagovali %(content)s"
+            "label": "%(reactors)s reagovali %(content)s",
+            "tooltip_caption": "reagoval/a s %(shortName)s"
         },
         "read_receipt_title": {
             "one": "Videl %(count)s človek",
+            "few": "Videli %(count)s ľudia",
             "other": "Videlo %(count)s ľudí"
         },
         "read_receipts_label": "Potvrdenia o prečítaní",
@@ -3289,11 +3700,13 @@
             "format": "%(nameList)s %(transitionList)s",
             "hidden_event": {
                 "one": "%(oneUser)sposlal/a skrytú správu",
-                "other": "%(oneUser)sposlal %(count)s skrytých správ"
+                "few": "%(oneUser)sposlal/a %(count)s skryté správy",
+                "other": "%(oneUser)sposlal/a %(count)s skrytých správ"
             },
             "hidden_event_multiple": {
-                "other": "%(severalUsers)sposlalo %(count)s skrytých správ",
-                "one": "%(severalUsers)sposlalo skrytú správu"
+                "one": "%(severalUsers)sposlalo skrytú správu",
+                "few": "%(severalUsers)sposlali %(count)s skryté správy",
+                "other": "%(severalUsers)sposlalo %(count)s skrytých správ"
             },
             "invite_withdrawn": {
                 "one": "%(oneUser)s ",
@@ -3376,8 +3789,9 @@
                 "other": "%(severalUsers)szmenili <a>pripnuté správy</a> v miestnosti %(count)s-krát"
             },
             "redacted": {
-                "other": "%(oneUser)s odstránil/a %(count)s správ",
-                "one": "%(oneUser)sodstránil správu"
+                "one": "%(oneUser)s odstránil správu",
+                "few": "%(oneUser)s odstránil/a %(count)s správy",
+                "other": "%(oneUser)s odstránil/a %(count)s správ"
             },
             "redacted_multiple": {
                 "one": "%(severalUsers)s odstránili správu",
@@ -3444,6 +3858,10 @@
     "truncated_list_n_more": {
         "other": "A %(count)s ďalších…"
     },
+    "unsupported_browser": {
+        "description": "Ak budete pokračovať, niektoré funkcie môžu prestať fungovať a existuje riziko, že v budúcnosti stratíte údaje. Aktualizujte svoj prehliadač, aby ste mohli pokračovať v používaní aplikácie %(brand)s.",
+        "title": "%(brand)s nepodporuje tento prehliadač"
+    },
     "unsupported_server_description": "Tento server používa staršiu verziu systému Matrix. Ak chcete používať %(brand)s bez chýb, aktualizujte na Matrix %(version)s.",
     "unsupported_server_title": "Váš server nie je podporovaný",
     "update": {
@@ -3461,6 +3879,13 @@
         "toast_title": "Aktualizovať %(brand)s",
         "unavailable": "Nedostupné"
     },
+    "update_room_access_modal": {
+        "description": "Ak chcete vytvoriť odkaz na zdieľanie, nastavte túto miestnosť ako <b> verejnú</b> alebo povolte používateľom možnosť <b>požiadať o pripojenie</b>. To umožní hosťom pripojiť sa bez pozvánky.",
+        "dont_change_description": "Ak nechcete zmeniť prístup do tejto miestnosti, môžete vytvoriť novú miestnosť pre odkaz na hovor.",
+        "no_change": "Nechcem zmeniť úroveň prístupu.",
+        "revert_access_description": "(Túto hodnotu je možné vrátiť na predchádzajúcu hodnotu v nastaveniach miestnosti: <b>Zabezpečenie a súkromie</b> / <b>Prístup</b>)",
+        "title": "Povoliť hosťom pripojiť sa k tejto miestnosti"
+    },
     "upload_failed_generic": "Nepodarilo sa nahrať súbor „%(fileName)s“.",
     "upload_failed_size": "Veľkosť súboru „%(fileName)s“ prekračuje limit veľkosti súboru nahrávania na tento domovský server",
     "upload_failed_title": "Nahrávanie zlyhalo",
@@ -3470,6 +3895,7 @@
         "error_files_too_large": "Tieto súbory sú <b>príliš veľké</b> na nahratie. Limit veľkosti súboru je %(limit)s.",
         "error_some_files_too_large": "Niektoré súbory sú <b>príliš veľké</b> na to, aby sa dali nahrať. Limit veľkosti súboru je %(limit)s.",
         "error_title": "Chyba pri nahrávaní",
+        "not_image": "Súbor, ktorý ste vybrali, nie je platným súborom obrázka.",
         "title": "Nahrať súbory",
         "title_progress": "Nahrať súbory (%(current)s z %(total)s)",
         "upload_all_button": "Nahrať všetko",
@@ -3501,6 +3927,7 @@
         "error_mute_user": "Nepodarilo sa umlčať používateľa",
         "error_revoke_3pid_invite_description": "Pozvánku nebolo možné odvolať. Na serveri môže byť dočasný problém alebo nemáte dostatočné oprávnenia na odvolanie pozvánky.",
         "error_revoke_3pid_invite_title": "Nepodarilo sa odvolať pozvánku",
+        "ignore_button": "Ignorovať",
         "ignore_confirm_description": "Všetky správy a pozvánky od tohto používateľa budú skryté. Ste si istí, že ich chcete ignorovať?",
         "ignore_confirm_title": "Ignorovať %(user)s",
         "invited_by": "Pozvaný používateľom %(sender)s",
@@ -3514,11 +3941,13 @@
         "promote_warning": "Túto zmenu nebudete môcť vrátiť späť, pretože tomuto používateľovi udeľujete rovnakú úroveň oprávnenia, akú máte vy.",
         "redact": {
             "confirm_button": {
-                "other": "Odstrániť %(count)s správ",
-                "one": "Odstrániť 1 správu"
+                "one": "Odstrániť 1 správu",
+                "few": "Odstrániť %(count)s správy",
+                "other": "Odstrániť %(count)s správ"
             },
             "confirm_description_1": {
                 "one": "Chystáte sa odstrániť %(count)s správu od používateľa %(user)s. Týmto ju natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?",
+                "few": "Chystáte sa odstrániť %(count)s správy od používateľa %(user)s. Týmto ich natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?",
                 "other": "Chystáte sa odstrániť %(count)s správ od používateľa %(user)s. Týmto ich natrvalo odstránite pre všetkých účastníkov konverzácie. Chcete pokračovať?"
             },
             "confirm_description_2": "Pri veľkom množstve správ to môže trvať určitý čas. Medzitým prosím neobnovujte svojho klienta.",
@@ -3528,23 +3957,27 @@
             "no_recent_messages_description": "Skúste sa posunúť nahor na časovej osi a pozrite sa, či tam nie sú nejaké skoršie.",
             "no_recent_messages_title": "Nenašli sa žiadne nedávne správy od používateľa %(user)s"
         },
-        "redact_button": "Odstrániť posledné správy",
+        "redact_button": "Odstrániť správy",
         "revoke_invite": "Odvolať pozvánku",
         "room_encrypted": "Správy v tejto miestnosti sú šifrované od vás až k príjemcovi.",
         "room_encrypted_detail": "Vaše správy sú zabezpečené a jedinečné kľúče na ich odomknutie máte len vy a príjemca.",
         "room_unencrypted": "Správy v tejto miestnosti nie sú šifrované od vás až k príjemcovi.",
         "room_unencrypted_detail": "V šifrovaných miestnostiach sú vaše správy zabezpečené a jedinečné kľúče na ich odomknutie máte len vy a príjemca.",
-        "share_button": "Zdieľať odkaz na používateľa",
+        "send_message": "Odoslať správu",
+        "share_button": "Zdieľať profil",
         "unban_button_room": "Zrušiť zákaz vstupu do miestnosti",
         "unban_button_space": "Zrušiť zákaz vstupu do priestoru",
         "unban_room_confirm_title": "Zrušiť zákaz vstup do %(roomName)s",
         "unban_space_everything": "Zrušiť im zákaz zo všetkého, na čo mám oprávnenie",
         "unban_space_specific": "Zrušiť im zákaz z konkrétnych právomocí, na ktoré mám oprávnenie",
         "unban_space_warning": "Nebudú mať prístup k tomu, čoho nie ste správcom.",
+        "unignore_button": "Prestať ignorovať",
+        "verification_unavailable": "Overenie používateľa nie je k dispozícii",
         "verify_button": "Overiť používateľa",
         "verify_explainer": "V záujme zvýšenia bezpečnosti overte tohto používateľa tak, že na oboch zariadeniach skontrolujete jednorazový kód."
     },
     "user_menu": {
+        "link_new_device": "Prepojiť nové zariadenie",
         "settings": "Všetky nastavenia",
         "switch_theme_dark": "Prepnúť na tmavý režim",
         "switch_theme_light": "Prepnúť na svetlý režim"
@@ -3568,6 +4001,7 @@
         "camera_disabled": "Váš fotoaparát je vypnutý",
         "camera_enabled": "Fotoaparát je stále zapnutý",
         "cannot_call_yourself_description": "Nemôžete zavolať samému sebe.",
+        "close_lobby": "Zatvoriť lobby",
         "connecting": "Pripájanie",
         "connection_lost": "Spojenie so serverom bolo prerušené",
         "connection_lost_description": "Bez pripojenia k serveru nie je možné uskutočňovať hovory.",
@@ -3581,14 +4015,23 @@
         "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",
+        "element_call": "Element Call",
         "enable_camera": "Zapnúť kameru",
         "enable_microphone": "Zrušiť stlmenie mikrofónu",
         "expand": "Návrat k hovoru",
+        "get_call_link": "Zdieľať odkaz na hovor",
         "hangup": "Zavesiť",
         "hide_sidebar_button": "Skryť bočný panel",
         "input_devices": "Vstupné zariadenia",
+        "jitsi_call": "Konferencia Jitsi",
         "join_button_tooltip_call_full": "Prepáčte — tento hovor je momentálne obsadený",
+        "legacy_call": "Zastaraný hovor",
         "maximise": "Vyplniť obrazovku",
+        "maximise_call": "Maximalizovať hovor",
+        "metaspace_video_rooms": {
+            "conference_room_section": "Konferencie"
+        },
+        "minimise_call": "Minimalizovať hovor",
         "misconfigured_server": "Hovor zlyhal z dôvodu nesprávne nastaveného servera",
         "misconfigured_server_description": "Prosím, požiadajte správcu vášho domovského servera (<code>%(homeserverDomain)s</code>) aby nakonfiguroval Turn server, čo zlepší spoľahlivosť audio / video hovorov.",
         "misconfigured_server_fallback": "Prípadne môžete skúsiť použiť verejný server na adrese <server/>, ale nebude to tak spoľahlivé a vaša IP adresa bude zdieľaná s týmto serverom. Môžete to spravovať aj v nastaveniach.",
@@ -3599,6 +4042,7 @@
         "msisdn_transfer_failed": "Nie je možné presmerovať hovor",
         "n_people_joined": {
             "one": "%(count)s človek sa pripojil",
+            "few": "%(count)s ľudia sa pripojili",
             "other": "%(count)s ľudí sa pripojilo"
         },
         "no_audio_input_description": "Vo vašom zariadení sa nenašiel mikrofón. Skontrolujte svoje nastavenia a skúste to znova.",
@@ -3636,6 +4080,7 @@
         "user_is_presenting": "%(sharerName)s prezentuje",
         "video_call": "Video hovor",
         "video_call_started": "Videohovor bol spustený",
+        "video_call_using": "Videohovor pomocou:",
         "voice_call": "Hlasový hovor",
         "you_are_presenting": "Prezentujete"
     },
@@ -3735,7 +4180,7 @@
         "error_need_to_be_logged_in": "Mali by ste byť prihlásení.",
         "error_unable_start_audio_stream_description": "Nie je možné spustiť streamovanie zvuku.",
         "error_unable_start_audio_stream_title": "Nepodarilo sa spustiť livestream",
-        "modal_data_warning": "Údaje na tejto obrazovke sú zdieľané s %(widgetDomain)s",
+        "modal_data_warning": "Nižšie uvedené údaje sú zdieľané s %(widgetDomain)s",
         "modal_title_default": "Modálny widget",
         "no_name": "Neznáma aplikácia",
         "open_id_permissions_dialog": {
@@ -3744,7 +4189,7 @@
             "title": "Umožniť tomuto widgetu overiť vašu totožnosť"
         },
         "popout": "Otvoriť widget v novom okne",
-        "set_room_layout": "Nastavenie rozmiestnenie v mojej miestnosti pre všetkých",
+        "set_room_layout": "Nastaviť rozmiestnenie pre všetkých",
         "shared_data_avatar": "Vaša URL adresa profilového obrázka",
         "shared_data_device_id": "ID vášho zariadenia",
         "shared_data_lang": "Váš jazyk",
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index c8c3d96757..15ea9a3df8 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -85,7 +85,6 @@
         "react": "Reagoni",
         "refresh": "Rifreskoje",
         "register": "Regjistrohuni",
-        "reject": "Hidheni tej",
         "reload": "Ringarkoje",
         "remove": "Hiqe",
         "rename": "Riemërtojeni",
@@ -411,7 +410,6 @@
         "capabilities": "Aftësi",
         "copied": "U kopjua!",
         "credits": "Kredite",
-        "cross_signing": "<em>Cross-signing</em>",
         "dark": "E errët",
         "description": "Përshkrim",
         "deselect_all": "Shpërzgjidhi krejt",
@@ -757,44 +755,23 @@
     "empty_room_was_name": "Dhomë e zbrazët (qe %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Që të vazhdohet, jepni Frazën tuaj të Sigurisë, ose <button>përdorni Kyçin tuaj të Sigurisë</button>.",
             "key_validation_text": {
-                "invalid_security_key": "Kyç Sigurie i Pavlefshëm",
-                "recovery_key_is_correct": "Mirë duket!",
-                "wrong_file_type": "Lloj i gabuar kartele",
                 "wrong_security_key": "Kyç Sigurie i Gabuar"
             },
-            "reset_title": "Kthe gjithçka te parazgjedhjet",
-            "reset_warning_1": "Bëjeni këtë vetëm nëse s’keni pajisje tjetër me të cilën të plotësoni verifikimin.",
-            "reset_warning_2": "Nëse riktheni gjithçka te parazgjedhjet, do të rifilloni pa sesione të besuara, pa përdorues të besuar, dhe mund të mos jeni në gjendje të shihni mesazhe të dikurshëm.",
             "restoring": "Po rikthehen kyçesh nga kopjeruajtje",
-            "security_key_title": "Kyç Sigurie",
-            "security_phrase_incorrect_error": "S’arrihet të hyhet në depozitë të fshehtë. Ju lutemi, verifikoni se keni dhënë Frazën e saktë të Sigurisë.",
-            "security_phrase_title": "Frazë Sigurie",
-            "separator": "%(securityKey)s ose %(recoveryFile)s",
-            "use_security_key_prompt": "Që të vazhdohet përdorni Kyçin tuaj të Sigurisë."
+            "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_not_ready": "“Cross-signing” s’është ujdisur.",
-        "cross_signing_ready": "“Cross-signing” është gati për përdorim.",
-        "cross_signing_ready_no_backup": "“Cross-signing” është gati, por kyçet s’janë koperuajtur.",
         "cross_signing_room_normal": "Kjo dhomë është e fshehtëzuar skaj-më-skaj",
         "cross_signing_room_verified": "Gjithkush në këtë dhomë është verifikuar",
         "cross_signing_room_warning": "Dikush po përdor një sesion të panjohur",
-        "cross_signing_unsupported": "Shërbyesi juaj Home nuk mbulon <em>cross-signing</em>.",
-        "cross_signing_untrusted": "Llogaria juaj ka një identitet <em>cross-signing</em> në depozitë të fshehtë, por s’është ende i besuar në këtë sesion.",
         "cross_signing_user_normal": "S’e keni verifikuar këtë përdorues.",
         "cross_signing_user_verified": "E keni verifikuar këtë përdorues. Ky përdorues ka verifikuar krejt sesionet e veta.",
         "cross_signing_user_warning": "Ky përdorues s’ka verifikuar krejt sesionet e tij.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Spastro kyçe <em>cross-signing</em>",
-            "title": "Të shkatërrohen kyçet <em>cross-signing</em>?",
-            "warning": "Fshirja e kyçeve <em>cross-signing</em> është e përhershme. Cilido që keni verifikuar me to, do të shohë një sinjalizim sigurie. Thuajse e sigurt që s’keni pse ta bëni një gjë të tillë, veç në paçi humbur çdo pajisje prej nga mund të bëni <em>cross-sign</em>."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Mirëfilltësia e këtij mesazhi të fshehtëzuar s’mund të garantohet në këtë pajisje.",
         "event_shield_reason_mismatched_sender_key": "Fshehtëzuar nga një sesion i paverifikuar",
         "export_unsupported": "Shfletuesi juaj nuk mbulon zgjerimet kriptografike të domosdoshme",
@@ -814,7 +791,6 @@
             "title": "Metodë e Re Rimarrjesh",
             "warning": "Nëse metodën e re të rimarrjeve s’e keni caktuar 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."
         },
-        "not_supported": "<nuk mbulohet>",
         "recovery_method_removed": {
             "description_1": "Ky sesion ka pikasur se Fraza e Sigurisë dhe kyçi juaj për Mesazhe të Sigurt janë hequr.",
             "description_2": "Nëse këtë e keni bërë pa dashje, mund të ujdisni Mesazhe të Sigurt në këtë sesion, gjë që do të sjellë rifshehtëzimin e historikut të mesazheve të sesionit me një metodë të re rimarrjesh.",
@@ -825,8 +801,7 @@
         "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.",
-            "title": "Rregulloje"
+            "explainer": "Kopjeruajini kyçet tuaj, përpara se të dilni, që të shmangni humbjen e tyre."
         },
         "udd": {
             "interactive_verification_button": "Verifikojeni në mënyrë ndërvepruese përmes emoji-sh",
@@ -841,7 +816,6 @@
             "accepting": "Po pranohet…",
             "after_new_login": {
                 "device_verified": "Pajisja u verifikua",
-                "reset_confirmation": "Të kthehen vërtet te parazgjedhjet kyçet e verifikimit?",
                 "skip_verification": "Anashkaloje verifikimin hëpërhë",
                 "unable_to_verify": "S’arrihet të verifikohet kjo pajisje",
                 "verify_this_device": "Verifikoni këtë pajisje"
@@ -911,8 +885,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_reset_warning_1": "Rikthimi te parazgjedhjet i kyçeve tuaj të verifikimit s’mund të zhbëhet. Pas rikthimit te parazgjedhjet, s’do të mund të hyni dot te mesazhe të dikurshëm të fshehtëzuar dhe, cilido shok që ju ka verifikuar më parë, do të shohë një sinjalizim sigurie deri sa të ribëni verifikimin me ta.",
-            "verify_reset_warning_2": "Ju lutemi, ecni më tej vetëm nëse jeni i sigurt se keni humbur krejt pajisjet tuaja të tjera dhe Kyçin tuaj të Sigurisë.",
             "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",
@@ -971,11 +943,7 @@
             "title": "S’arrihet të kopjohet lidhja e dhomës"
         },
         "error_loading_user_profile": "S’u ngarkua dot profili i përdoruesit",
-        "forget_room_failed": "S’u arrit të harrohej dhoma %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Shërbyesi mund të jetë i pakapshëm, i mbingarkuar, ose kërkimit i mbaroi koha :(",
-            "title": "Kërkimi shtoi"
-        }
+        "forget_room_failed": "S’u arrit të harrohej dhoma %(errCode)s"
     },
     "event_preview": {
         "m.call.answer": {
@@ -1540,11 +1508,6 @@
         "ongoing": "Po hiqet…",
         "reason_label": "Arsye (opsionale)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Jeni i sigurt se doni të hidhet tej kjo ftesë?",
-        "failed": "S’u arrit të hidhej poshtë ftesa",
-        "title": "Hidheni tej ftesën"
-    },
     "report_content": {
         "description": "Raportimi i këtij mesazhi do të shkaktojë dërgimin e 'ID-së së aktit' unike te përgjegjësi i shërbyesit tuaj Home. Nëse mesazhet në këtë dhomë fshehtëzohen, përgjegjësi i shërbyesit tuaj Home s’do të jetë në gjendje të lexojë tekstin e mesazhit apo të shohë çfarëdo kartelë apo figurë.",
         "disagree": "S’pajtohem",
@@ -1712,7 +1675,6 @@
             "you_created": "Krijuat këtë dhomë."
         },
         "invite_email_mismatch_suggestion": "Që të merrni ftesa drejt e te %(brand)s, ndajeni me të tjerët këtë email, te Rregullimet.",
-        "invite_reject_ignore": "Hidhe poshtë & Shpërfille përdoruesin",
         "invite_sent_to_email": "Kjo ftesë u dërgua për %(email)s",
         "invite_sent_to_email_room": "Kjo ftesë për %(roomName)s u dërgua te %(email)s",
         "invite_subtitle": "Ju ftoi <userName/>",
@@ -2201,7 +2163,6 @@
             "remove_msisdn_prompt": "Të hiqet %(phone)s?",
             "spell_check_locale_placeholder": "Zgjidhni vendore"
         },
-        "image_thumbnails": "Shfaq për figurat paraparje/miniatura",
         "inline_url_previews_default": "Aktivizo, si parazgjedhje, paraparje URL-sh brendazi",
         "inline_url_previews_room": "Aktivizo, si parazgjedhje, paraparje URL-sh për pjesëmarrësit në këtë dhomë",
         "inline_url_previews_room_account": "Aktivizo paraparje URL-sh për këtë dhomë (prek vetëm ju)",
@@ -2309,50 +2270,16 @@
         "prompt_invite": "Pyet, përpara se të dërgohen ftesa te ID Matrix potencialisht të pavlefshme",
         "replace_plain_emoji": "Zëvendëso automatikisht emotikone tekst të thjeshtë me Emoji",
         "security": {
-            "4s_public_key_in_account_data": "në të dhëna llogarie",
-            "4s_public_key_status": "Kyç publik depozite të fshehtë:",
-            "backup_key_cached_status": "Kyç kopjeruajtjesh i ruajtur në fshehtinë:",
-            "backup_key_stored_status": "Kyç kopjeruajtjesh i depozituar:",
-            "backup_key_unexpected_type": "lloj i papritur",
-            "backup_key_well_formed": "e mirëformuar",
-            "backup_keys_description": "Kopjeruani kyçet tuaj të fshehtëzimit me të dhënat e llogarisë tuaj, për ditën kur mund të humbni hyrje në sesionet tuaja. Kyçet tuaj do të jenë të siguruar me një Kyç unik Sigurie.",
             "bulk_options_accept_all_invites": "Prano krejt ftesat prej %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Mos prano asnjë ftesë për në %(invitedRooms)s",
             "bulk_options_section": "Veprime masive",
-            "cross_signing_cached": "ruajtur në fshehtinë lokalisht",
-            "cross_signing_homeserver_support": "Mbulim veçorish nga shërbyesi Home:",
-            "cross_signing_homeserver_support_exists": "ekziston",
-            "cross_signing_in_4s": "në depozitë të fshehtë",
-            "cross_signing_in_memory": "në kujtesë",
-            "cross_signing_master_private_Key": "Kyç privat i përgjithshëm:",
-            "cross_signing_not_cached": "i pagjetur lokalisht",
-            "cross_signing_not_found": "s’u gjet",
-            "cross_signing_not_in_4s": "s’u gjet në depozitë",
-            "cross_signing_not_stored": "e padepozituar",
-            "cross_signing_private_keys": "Kyçe privatë për <em>cross-signing</em>:",
-            "cross_signing_public_keys": "Kyçe publikë për <em>cross-signing</em>:",
-            "cross_signing_self_signing_private_key": "Kyç privat vetënënshkrimi:",
-            "cross_signing_user_signing_private_key": "Kyç privat nënshkrimesh përdoruesi:",
-            "cryptography_section": "Kriptografi",
-            "delete_backup": "Fshije Kopjeruajtjen",
-            "delete_backup_confirm_description": "Jeni i sigurt? Do të humbni mesazhet tuaj të fshehtëzuar, nëse kopjeruajtja për kyçet tuaj nuk bëhet si duhet.",
             "e2ee_default_disabled_warning": "Përgjegjësi i shërbyesit tuaj ka çaktivizuar fshehtëzimin skaj-më-skaj, si parazgjedhje, në dhoma private & Mesazhe të Drejtpërdrejtë.",
             "enable_message_search": "Aktivizo kërkim mesazhesh në dhoma të fshehtëzuara",
             "encryption_section": "Fshehtëzim",
-            "error_loading_key_backup_status": "S’arrihet të ngarkohet gjendje kopjeruajtjeje kyçesh",
-            "export_megolm_keys": "Eksporto kyçe dhome E2E",
             "ignore_users_empty": "S’keni përdorues të shpërfillur.",
             "ignore_users_section": "Përdorues të shpërfillur",
-            "import_megolm_keys": "Importo kyçe E2E dhome",
-            "key_backup_active": "Kjo sesion po bën kopjeruajtje të kyçeve tuaja.",
-            "key_backup_active_version_none": "Asnjë",
             "key_backup_algorithm": "Algoritëm:",
-            "key_backup_complete": "U kopjeruajtën krejt kyçet",
             "key_backup_connect": "Lidhe këtë sesion me Kopjeruajtje Kyçesh",
-            "key_backup_connect_prompt": "Lidheni këtë sesion kopjeruajtje kyçesh, përpara se të dilni, që të shmangni humbje të çfarëdo kyçi që mund të gjendet vetëm në këtë pajisje.",
-            "key_backup_in_progress": "Po kopjeruhen kyçet për %(sessionsRemaining)s…",
-            "key_backup_inactive": "Ky sesion <b>nuk po bën kopjeruajtje të kyçeve tuaja</b>, por keni një kopjeruajtje ekzistuese që mund ta përdorni për rimarrje dhe ta shtoni më tej.",
-            "key_backup_inactive_warning": "Kyçet tuaj <b>nuk po kopjeruhen nga ky sesion</b>.",
             "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": {
@@ -2372,13 +2299,7 @@
             "message_search_unsupported": "%(brand)s-it i mungojnë disa përbërës të domosdoshëm për ruajtje lokalisht në mënyrë të sigurt në fshehtinë mesazhe. Nëse do të donit të eksperimentonit me këtë veçori, montoni një Desktop vetjak %(brand)s Desktop me <nativeLink>shtim përbërësish kërkimi</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s s’mund të ruajë lokalisht në fshehtinë në mënyrë të siguruar mesazhe të fshehtëzuar, teksa xhirohet në një shfletues. Që mesazhet e fshehtëzuar të shfaqen te përfundime kërkimi, përdorni <desktopLink>%(brand)s Desktop</desktopLink>.",
             "record_session_details": "Regjistro emrin, versionin dhe URL-në e klientit, për të dalluar më kollaj sesionet te përgjegjës sesionesh",
-            "restore_key_backup": "Riktheje prej Kopjeruajtje",
-            "secret_storage_not_ready": "jo gati",
-            "secret_storage_ready": "gati",
-            "secret_storage_status": "Depozitë e fshehtë:",
             "send_analytics": "Dërgo të dhëna analitike",
-            "session_id": "ID sesioni:",
-            "session_key": "Kyç sesioni:",
             "strict_encryption": "Mos dërgo kurrë prej këtij sesioni mesazhe të fshehtëzuar te sesione të paverifikuar"
         },
         "send_read_receipts": "Dërgo dëftesa leximi",
@@ -2597,8 +2518,6 @@
         "topic": "Merr ose cakton temën e dhomës",
         "topic_none": "Kjo dhomë s’ka temë.",
         "topic_room_error": "S’u arrit të merret tema e dhomës: S’arrihet të gjendet dhomë (%(roomId)s",
-        "tovirtual": "Kalohet te dhoma virtuale e kësaj dhome, në pastë",
-        "tovirtual_not_found": "S’ka dhomë virtuale për këtë dhomë",
         "unban": "I heq dëbimin përdoruesit me ID-në e dhënë",
         "unflip": "E paraprin një mesazh tekst i thjeshtë me ┬──┬ ノ( ゜-゜ノ)",
         "unholdcall": "E heq nga pritja thirrjen në dhomën aktuale",
@@ -2717,7 +2636,6 @@
         "heading_without_query": "Kërkoni për",
         "join_button_text": "Hyni te %(roomAddress)s",
         "keyboard_scroll_hint": "Përdorni <arrows/> për rrëshqitje",
-        "message_search_section_title": "Kërkime të tjera",
         "other_rooms_in_space": "Dhoma të tjera në %(spaceName)s",
         "public_rooms_label": "Dhoma publike",
         "recent_searches_section_title": "Kërkime së fundi",
@@ -2726,7 +2644,6 @@
         "result_may_be_hidden_privacy_warning": "Disa përfundime mund të jenë fshehur, për arsye privatësie",
         "result_may_be_hidden_warning": "Disa përfundime mund të jenë të fshehura",
         "search_dialog": "Dialog Kërkimi",
-        "search_messages_hint": "Që të kërkoni te mesazhet, shihni për këtë ikonë në krye të një dhome <icon/>",
         "spaces_title": "Hapësira ku jeni i pranishëm",
         "start_group_chat_button": "Nisni një fjalosje grupi"
     },
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 34b573defb..49e9908dc4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -12,6 +12,16 @@
             "one": "1 oläst omnämnande."
         },
         "recent_rooms": "Nyliga rum",
+        "room_messsage_not_sent": "Öppna rummet %(roomName)s med ett osänt meddelande.",
+        "room_n_unread_invite": "Öppna inbjudan till rummet %(roomName)s.",
+        "room_n_unread_messages": {
+            "one": "Öppna rummet %(roomName)s med 1 oläst meddelande.",
+            "other": "Öppna rummet %(roomName)s med %(count)s olästa meddelanden."
+        },
+        "room_n_unread_messages_mentions": {
+            "one": "Öppna rummet %(roomName)s med 1 oläst omnämnande.",
+            "other": "Öppna rummet %(roomName)s med %(count)s olästa meddelanden inklusive omnämnanden."
+        },
         "room_name": "Rum %(name)s",
         "room_status_bar": "Rumsstatusfält",
         "seek_bar_label": "Förloppsfält för ljud",
@@ -45,6 +55,8 @@
         "create_a_room": "Skapa ett rum",
         "create_account": "Skapa konto",
         "decline": "Avvisa",
+        "decline_and_block": "Avvisa och blockera",
+        "decline_invite": "Avböj inbjudan",
         "delete": "Radera",
         "deny": "Neka",
         "disable": "Inaktivera",
@@ -64,6 +76,7 @@
         "go": "Gå",
         "go_back": "Gå tillbaka",
         "got_it": "Uppfattat",
+        "hide": "Dölj",
         "hide_advanced": "Dölj avancerat",
         "hold": "Parkera",
         "ignore": "Ignorera",
@@ -80,12 +93,14 @@
         "maximise": "Maximera",
         "mention": "Nämn",
         "minimise": "Minimera",
+        "new_message": "Nytt meddelande",
         "new_room": "Nytt rum",
         "new_video_room": "Nytt videorum",
         "next": "Nästa",
         "no": "Nej",
         "ok": "OK",
         "open": "Öppna",
+        "open_menu": "Öppna menyn",
         "pause": "Pausa",
         "pin": "Häftstift",
         "play": "Spela",
@@ -94,13 +109,13 @@
         "react": "Reagera",
         "refresh": "Ladda om",
         "register": "Registrera",
-        "reject": "Avböj",
         "reload": "Ladda om",
         "remove": "Ta bort",
         "rename": "Döp om",
         "reply": "Svara",
         "reply_in_thread": "Svara i tråd",
         "report_content": "Rapportera innehåll",
+        "report_room": "Anmäl rum",
         "resend": "Skicka igen",
         "reset": "Återställ",
         "resume": "Återuppta",
@@ -405,6 +420,15 @@
         "download_logs": "Ladda ner loggar",
         "downloading_logs": "Laddar ner loggar",
         "error_empty": "Berätta vad som gick fel, eller skapa ännu hellre ett GitHub-ärende som beskriver problemet.",
+        "failed_download_logs": "Misslyckades att ladda ner felsökningsloggar: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Din felrapport avvisades. Raseriskak-servern stöder inte den här applikationen.",
+            "rejected_generic": "Din felrapport avvisades. Raseriskak-servern avvisade innehållet i rapporten på grund av en policy.",
+            "rejected_recovery_key": "Din felrapport avvisades av säkerhetsskäl, eftersom den innehöll en återställningsnyckel.",
+            "rejected_version": "Din felrapport avvisades eftersom versionen du kör är för gammal.",
+            "server_unknown_error": "Raseriskak-servern stötte på ett okänt fel och kunde inte hantera rapporten.",
+            "unknown_error": "Misslyckades att skicka loggar."
+        },
         "github_issue": "GitHub-ärende",
         "introduction": "Om du har rapporterat en bugg via GitHub så kan felsökningsloggar hjälpa oss att hitta problemet. ",
         "log_request": "För att hjälpa oss att förhindra detta i framtiden, vänligen <a>skicka oss loggar</a>.",
@@ -444,6 +468,7 @@
         "access_token": "Åtkomsttoken",
         "accessibility": "Tillgänglighet",
         "advanced": "Avancerat",
+        "all_chats": "Alla chattar",
         "analytics": "Statistik",
         "and_n_others": {
             "other": "och %(count)s andra…",
@@ -462,7 +487,6 @@
         "capabilities": "Förmågor",
         "copied": "Kopierat!",
         "credits": "Medverkande",
-        "cross_signing": "Korssignering",
         "dark": "Mörkt",
         "description": "Beskrivning",
         "deselect_all": "Välj bort alla",
@@ -501,6 +525,7 @@
         "message_timestamp_invalid": "Ogiltig tidsstämpel",
         "microphone": "Mikrofon",
         "model": "Modell",
+        "moderation_and_safety": "Moderering och säkerhet",
         "modern": "Modernt",
         "mute": "Tysta",
         "n_members": {
@@ -536,6 +561,7 @@
         "qr_code": "QR-kod",
         "random": "Slumpmässig",
         "reactions": "Reaktioner",
+        "recommended": "Rekommenderad",
         "report_a_bug": "Rapportera en bugg",
         "room": "Rum",
         "room_name": "Rumsnamn",
@@ -721,6 +747,13 @@
         "twemoji": "Emojigrafiken <twemoji>Twemoji</twemoji> är © <author>Twitter, Inc och andra bidragsgivare</author> och används under villkoren i <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Teckensnittet <colr>twemoji-colr</colr> är © <author>Mozilla Foundation</author> och används under villkoren för <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Är du säker på att du vill avböja inbjudan att gå med i \"%(roomName)s\"?",
+        "ignore_user_help": "Du kommer inte att se några meddelanden eller rumsinbjudningar från den här användaren.",
+        "reason_description": "Beskriv anledningen att anmäla rummet.",
+        "report_room_description": "Rapportera det här rummet till din kontoleverantör.",
+        "title": "Avböj inbjudan"
+    },
     "desktop_default_device_name": "%(brand)s Skrivbord: %(platformName)s",
     "devtools": {
         "active_widgets": "Aktiva widgets",
@@ -728,6 +761,44 @@
         "category_room": "Rum",
         "caution_colon": "Varning:",
         "client_versions": "Klientversioner",
+        "crypto": {
+            "4s_public_key_in_account_data": "i kontouppgifter",
+            "4s_public_key_not_in_account_data": "Hittades inte",
+            "4s_public_key_status": "Publik nyckel för hemlig lagring:",
+            "backup_key_cached": "cachad lokalt",
+            "backup_key_cached_status": "Säkerhetskopierad nyckel cachad:",
+            "backup_key_not_stored": "inte lagrad",
+            "backup_key_stored": "i hemlig lagring",
+            "backup_key_stored_status": "Säkerhetskopieringsnyckel lagrad:",
+            "backup_key_unexpected_type": "oväntad typ",
+            "backup_key_well_formed": "välformad",
+            "cross_signing": "Korssignering",
+            "cross_signing_cached": "cachad lokalt",
+            "cross_signing_not_ready": "Korssignering är inte konfigurerad.",
+            "cross_signing_private_keys_in_storage": "i hemlig lagring",
+            "cross_signing_private_keys_in_storage_status": "Privata nycklar för korssignering:",
+            "cross_signing_private_keys_not_in_storage": "hittades inte i lagring",
+            "cross_signing_public_keys_on_device": "i minnet",
+            "cross_signing_public_keys_on_device_status": "Korssignerade publika nycklar:",
+            "cross_signing_ready": "Korssignering är klar för användning.",
+            "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",
+            "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.",
+            "key_backup_latest_version": "Senast version av säkerhetskopia på servern:",
+            "key_storage": "Nyckellagring",
+            "master_private_key_cached_status": "Privat huvudnyckel:",
+            "not_found": "hittades inte",
+            "not_found_locally": "hittades inte lokalt",
+            "secret_storage_not_ready": "inte klar",
+            "secret_storage_ready": "klar",
+            "secret_storage_status": "Hemlig lagring:",
+            "self_signing_private_key_cached_status": "Självsignerande privat nyckel:",
+            "title": "Totalsträckskryptering",
+            "user_signing_private_key_cached_status": "Privat nyckel för användarsignering:"
+        },
         "developer_mode": "Utvecklarläge",
         "developer_tools": "Utvecklarverktyg",
         "edit_setting": "Redigera inställningar",
@@ -783,6 +854,9 @@
         "setting_colon": "Inställning:",
         "setting_definition": "Inställningsdefinition:",
         "setting_id": "Inställnings-ID",
+        "settings": {
+            "elementCallUrl": "Element Call-URL"
+        },
         "settings_explorer": "Inställningar",
         "show_hidden_events": "Visa dolda händelser i tidslinjen",
         "spaces": {
@@ -835,52 +909,35 @@
     "empty_room_was_name": "Tomt rum (var %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Ange din säkerhetsfras eller <button>använd din säkerhetsnyckel</button> för att fortsätta.",
             "key_validation_text": {
-                "invalid_security_key": "Ogiltig säkerhetsnyckel",
-                "recovery_key_is_correct": "Ser bra ut!",
-                "wrong_file_type": "Fel filtyp",
                 "wrong_security_key": "Fel säkerhetsnyckel"
             },
-            "reset_title": "Återställ allt",
-            "reset_warning_1": "Gör detta endast om du inte har någon annan enhet att slutföra verifikationen med.",
-            "reset_warning_2": "Om du återställer allt så kommer du att börja om utan betrodda sessioner eller betrodda användare, och kommer kanske inte kunna se gamla meddelanden.",
             "restoring": "Återställer nycklar från säkerhetskopia",
-            "security_key_title": "Säkerhetsnyckel",
-            "security_phrase_incorrect_error": "Kan inte komma åt hemlig lagring. Vänligen verifiera att du angav rätt säkerhetsfras.",
-            "security_phrase_title": "Säkerhetsfras",
-            "separator": "%(securityKey)s eller %(recoveryFile)s",
-            "use_security_key_prompt": "Använd din säkerhetsnyckel för att fortsätta."
+            "security_key_title": "Säkerhetsnyckel"
         },
         "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_not_ready": "Korssignering är inte inställt.",
-        "cross_signing_ready": "Korssignering är klart att användas.",
-        "cross_signing_ready_no_backup": "Korssignering är klart, men nycklarna är inte säkerhetskopierade än.",
         "cross_signing_room_normal": "Det här rummet är totalsträckskrypterat",
         "cross_signing_room_verified": "Alla i det här rummet är verifierade",
         "cross_signing_room_warning": "Någon använder en okänd session",
-        "cross_signing_unsupported": "Din hemserver stöder inte korssignering.",
-        "cross_signing_untrusted": "Ditt konto har en korssigneringsidentitet i hemlig lagring, men den är inte betrodd av den här sessionen än.",
         "cross_signing_user_normal": "Du har inte verifierat den här användaren.",
         "cross_signing_user_verified": "Du har verifierat den här användaren. Den här användaren har verifierat alla sina sessioner.",
         "cross_signing_user_warning": "Den här användaren har inte verifierat alla sina sessioner.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Rensa korssigneringsnycklar",
-            "title": "Förstöra korssigneringsnycklar?",
-            "warning": "Radering av korssigneringsnycklar är permanent. Alla du har verifierat med kommer att se säkerhetsvarningar. Du vill troligen inte göra detta, såvida du inte har tappat bort alla enheter du kan korssignera från."
-        },
+        "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_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.",
         "event_shield_reason_unverified_identity": "Krypterad av en overifierad användare.",
         "export_unsupported": "Din webbläsare stödjer inte nödvändiga kryptografitillägg",
+        "forgot_recovery_key": "Har du glömt återställningsnyckeln?",
         "import_invalid_keyfile": "Inte en giltig %(brand)s-nyckelfil",
         "import_invalid_passphrase": "Autentiseringskontroll misslyckades: felaktigt lösenord?",
+        "key_storage_out_of_sync": "Din nyckellagring är inte synkroniserad.",
+        "key_storage_out_of_sync_description": "Bekräfta din återställningsnyckel för att behålla åtkomsten till din nyckellagring och meddelandehistorik.",
         "messages_not_secure": {
             "cause_1": "Din hemserver",
             "cause_2": "Hemservern användaren du verifierar är ansluten till",
@@ -895,7 +952,6 @@
             "title": "Ny återställningsmetod",
             "warning": "Om du inte har ställt in den nya å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."
         },
-        "not_supported": "<stöds inte>",
         "pinned_identity_changed": "%(displayName)ss (<b>%(userId)s</b> ) identitet verkar ha ändrats.<a> Läs mer</a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>:s identitet verkar ha ändrats. <a>Läs mer</a>",
         "recovery_method_removed": {
@@ -905,11 +961,13 @@
             "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.",
-            "title": "Sätt upp"
+            "explainer": "Säkerhetskopiera dina nycklar innan du loggar ut för att undvika att du blir av med dem."
         },
         "udd": {
             "interactive_verification_button": "Verifiera interaktivt med emoji",
@@ -924,7 +982,6 @@
             "accepting": "Accepterar…",
             "after_new_login": {
                 "device_verified": "Enhet verifierad",
-                "reset_confirmation": "Återställ verkligen verifieringsnycklar?",
                 "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"
@@ -995,8 +1052,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_reset_warning_1": "Återställning av dina verifieringsnycklar kan inte ångras. Efter återställning så kommer du inte att komma åt dina krypterade meddelanden, och alla vänner som tidigare har verifierat dig kommer att se säkerhetsvarningar tills du återverifierar med dem.",
-            "verify_reset_warning_2": "Fortsätt bara om du är säker på att du har förlorat alla dina övriga enheter och din säkerhetsnyckel.",
             "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",
@@ -1006,8 +1061,11 @@
             "waiting_other_user": "Väntar på att %(displayName)s ska verifiera…"
         },
         "verification_requested_toast_title": "Verifiering begärd",
+        "verified_identity_changed": "Verifierad identitet för %(displayName)s (<b>%(userId)s</b>) har ändrats. <a>Läs mer </a>",
+        "verified_identity_changed_no_displayname": "Verifierad identitet för <b>%(userId)s</b> har ändrats. <a>Läs mer </a>",
         "verify_toast_description": "Andra användare kanske inta litar på den",
-        "verify_toast_title": "Verifiera denna session"
+        "verify_toast_title": "Verifiera denna session",
+        "withdraw_verification_action": "Återkalla verifieringen"
     },
     "error": {
         "admin_contact": "Vänligen <a>kontakta din tjänstadministratör</a> för att fortsätta använda tjänsten.",
@@ -1062,11 +1120,7 @@
             "title": "Kunde inte kopiera rumslänken"
         },
         "error_loading_user_profile": "Kunde inte ladda användarprofil",
-        "forget_room_failed": "Misslyckades att glömma bort rummet %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Servern kan vara otillgänglig eller överbelastad, eller så tog sökningen för lång tid :(",
-            "title": "Sökning misslyckades"
-        }
+        "forget_room_failed": "Misslyckades att glömma bort rummet %(errCode)s"
     },
     "error_user_not_logged_in": "Användaren är inte inloggad",
     "event_preview": {
@@ -1191,6 +1245,7 @@
         "change": "Byt identitetsserver",
         "change_prompt": "Koppla ifrån från identitetsservern <current /> och anslut till <new /> istället?",
         "change_server_prompt": "Om du inte vill använda <server /> för att upptäcka och upptäckas av befintliga kontakter som du känner, ange en annan identitetsserver nedan.",
+        "changed": "Din identitetsserver har ändrats",
         "checking": "Kontrollerar servern",
         "description_connected": "Du använder för närvarande <server></server> för att upptäcka och upptäckas av befintliga kontakter som du känner. Du kan byta din identitetsserver nedan.",
         "description_disconnected": "Du använder för närvarande inte en identitetsserver. Lägg till en nedan om du vill upptäcka och bli upptäckbar av befintliga kontakter som du känner.",
@@ -1233,7 +1288,9 @@
         "title": "Webbläsaren stöds ej",
         "use_desktop_heading": "Använd %(brand)s skrivbord istället",
         "use_mobile_heading": "Använd %(brand)s på mobilen istället",
-        "use_mobile_heading_after_desktop": "Eller använd vår mobilapp"
+        "use_mobile_heading_after_desktop": "Eller använd vår mobilapp",
+        "windows_64bit": "Windows (64-bitars)",
+        "windows_arm_64bit": "Windows (ARM 64-bitars)"
     },
     "info_tooltip_title": "Information",
     "integration_manager": {
@@ -1242,6 +1299,7 @@
         "error_connecting_heading": "Kan inte ansluta till integrationshanteraren",
         "explainer": "Integrationshanterare får konfigurationsdata och kan ändra widgetar, skicka rumsinbjudningar och ställa in behörighetsnivåer å dina vägnar.",
         "manage_title": "Hantera integrationer",
+        "toggle_label": "Aktivera integrationshanteraren",
         "use_im": "Använd en integrationshanterare för att hantera bottar, widgets och dekalpaket.",
         "use_im_default": "Använd en integrationshanterare <b>(%(serverName)s)</b> för att hantera bottar, widgets och dekalpaket."
     },
@@ -1443,6 +1501,7 @@
         "location_share_live_description": "Temporär implementation. Platser stannar kvar i rumshistoriken.",
         "mjolnir": "Nya sätt att ignorera personer",
         "msc3531_hide_messages_pending_moderation": "Låt moderatorer dölja meddelanden i väntan på moderering.",
+        "new_room_list": "Aktivera ny rumslista",
         "notification_settings": "Nya aviseringsinställningar",
         "notification_settings_beta_caption": "Vi introducerar ett enklare sätt att ändra dina aviseringsinställningar. Anpassa din %(brand)s precis som du vill ha den.",
         "notification_settings_beta_title": "Aviseringsinställningar",
@@ -1566,8 +1625,14 @@
         "toggle_attribution": "Växla tillskrivning"
     },
     "member_list": {
+        "count": {
+            "one": "%(count)s medlem",
+            "other": "%(count)s medlemmar"
+        },
         "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)"
     },
     "member_list_back_action_label": "Rumsmedlemmar",
@@ -1590,6 +1655,7 @@
         "class_global": "Globalt",
         "class_other": "Annat",
         "default": "Standard",
+        "default_settings": "Matcha standardinställningar",
         "email_pusher_app_display_name": "E-postaviseringar",
         "enable_prompt_toast_description": "Aktivera skrivbordsaviseringar",
         "enable_prompt_toast_title": "Aviseringar",
@@ -1608,7 +1674,8 @@
         "mentions_and_keywords_description": "Bli endast aviserad om omnämnanden och nyckelord i enlighet med dina <a>inställningar</a>",
         "mentions_keywords": "Omnämnanden & nyckelord",
         "message_didnt_send": "Meddelande skickades inte. Klicka för info.",
-        "mute_description": "Du får inga aviseringar"
+        "mute_description": "Du får inga aviseringar",
+        "mute_room": "Tysta rum"
     },
     "notifier": {
         "m.key.verification.request": "%(name)s begär verifiering"
@@ -1710,11 +1777,6 @@
         "ongoing": "Tar bort…",
         "reason_label": "Orsak (valfritt)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Är du säker på att du vill avböja inbjudan?",
-        "failed": "Misslyckades att avböja inbjudan",
-        "title": "Avböj inbjudan"
-    },
     "report_content": {
         "description": "Att rapportera det här meddelandet kommer att skicka dess unika 'händelse-ID' till administratören för din hemserver. Om meddelanden i det här rummet är krypterade kommer din hemserveradministratör inte att kunna läsa meddelandetexten eller se några filer eller bilder.",
         "disagree": "Håll inte med",
@@ -1737,6 +1799,10 @@
         "spam_or_propaganda": "Spam eller propaganda",
         "toxic_behaviour": "Stötande beteende"
     },
+    "report_room": {
+        "description": "Rapportera det här rummet till din hemserveradministratör. Detta skickar rummets unika ID, men om meddelanden är krypterade kan administratören inte läsa dem eller visa delade filer.",
+        "reason_label": "Beskriv skälet"
+    },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Misslyckades att avkryptera %(failedCount)s sessioner!",
         "count_of_successfully_restored_keys": "Återställde framgångsrikt %(sessionCount)s nycklar",
@@ -1919,7 +1985,6 @@
             "you_created": "Du skapade det här rummet."
         },
         "invite_email_mismatch_suggestion": "Dela denna e-postadress i inställningarna för att motta inbjudningar direkt i %(brand)s.",
-        "invite_reject_ignore": "Avvisa och ignorera användare",
         "invite_sent_to_email": "Denna inbjudan skickades till %(email)s",
         "invite_sent_to_email_room": "Denna inbjudan till %(roomName)s skickades till %(email)s",
         "invite_subtitle": "Inbjuden av <userName/>",
@@ -2015,6 +2080,7 @@
             },
             "uploading_single_file": "Laddar upp %(filename)s"
         },
+        "video_room": "Det här rummet är ett videorum",
         "waiting_for_join_subtitle": "När inbjudna användare har gått med i %(brand)s kommer du att kunna chatta och rummet kommer att vara totalsträckskrypterat",
         "waiting_for_join_title": "Väntar på att användare går med i %(brand)s"
     },
@@ -2023,20 +2089,55 @@
         "add_space_label": "Lägg till utrymme",
         "breadcrumbs_empty": "Inga nyligen besökta rum",
         "breadcrumbs_label": "Nyligen besökta rum",
+        "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_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_chats": "Visa alla chattar"
+        },
         "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",
+            "people": "Personer",
+            "rooms": "Rum",
+            "unread": "Olästa"
+        },
         "home_menu_label": "Hemalternativ",
         "join_public_room_label": "Gå med i offentligt rum",
         "joining_rooms_status": {
             "one": "Går just nu med i %(count)s rum",
             "other": "Går just nu med i %(count)s rum"
         },
+        "list_title": "Rumslista",
+        "more_options": {
+            "copy_link": "Kopiera rumslänk",
+            "favourited": "Favoritmarkerad",
+            "leave_room": "Lämna rum",
+            "low_priority": "Låg prioritet",
+            "mark_read": "Markera som läst",
+            "mark_unread": "Markera som oläst"
+        },
         "notification_options": "Aviseringsinställningar",
+        "open_space_menu": "Öppna utrymmesmenyn",
+        "primary_filters": "Filter för rumslista",
         "redacting_messages_status": {
             "one": "Tar just nu bort meddelanden i %(count)s rum",
             "other": "Tar just nu bort meddelanden i %(count)s rum"
         },
+        "room": {
+            "more_options": "Fler alternativ",
+            "open_room": "Öppet rummet %(roomName)s"
+        },
+        "room_options": "Rumsalternativ",
         "show_less": "Visa mindre",
         "show_n_more": {
             "other": "Visa %(count)s till",
@@ -2047,6 +2148,10 @@
         "sort_by_activity": "Aktivitet",
         "sort_by_alphabet": "A-Ö",
         "sort_unread_first": "Visa rum med olästa meddelanden först",
+        "space_menu": {
+            "home": "Utrymmeshem",
+            "space_settings": "Utrymmesinställningar"
+        },
         "space_menu_label": "%(spaceName)s-alternativ",
         "sublist_options": "Listalternativ",
         "suggested_rooms_heading": "Föreslagna rum"
@@ -2399,6 +2504,72 @@
         "emoji_autocomplete": "Aktivera emojiförslag medan du skriver",
         "enable_markdown": "Aktivera Markdown",
         "enable_markdown_description": "Börja meddelanden med <code>/plain</code> för att skicka utan markdown.",
+        "encryption": {
+            "advanced": {
+                "breadcrumb_first_description": "Dina kontouppgifter, kontakter, inställningar och chattlista sparas",
+                "breadcrumb_page": "Återställ kryptering",
+                "breadcrumb_second_description": "Du kommer att förlora all meddelandehistorik som bara lagras på servern",
+                "breadcrumb_third_description": "Du måste verifiera alla dina befintliga enheter och kontakter igen",
+                "breadcrumb_title": "Är du säker på att du vill återställa din identitet?",
+                "breadcrumb_title_forgot": "Glömt din återställningsnyckel? Du måste återställa din identitet.",
+                "breadcrumb_title_sync_failed": "Misslyckades att synkronisera nyckellagringen. Du måste återställa din identitet.",
+                "breadcrumb_warning": "Gör bara detta om du tror att ditt konto har utsatts för intrång.",
+                "details_title": "Krypteringsdetaljer",
+                "do_not_close_warning": "Stäng inte fönstret förrän återställningen är klar",
+                "export_keys": "Exportera nycklar",
+                "import_keys": "Importera nycklar",
+                "other_people_device_description": "Som standard i krypterade rum, skicka inte krypterade meddelanden till någon förrän du har verifierat dem",
+                "other_people_device_label": "Skicka aldrig krypterade meddelanden till obekräftade enheter",
+                "other_people_device_title": "Andras enheter",
+                "reset_identity": "Återställ kryptografisk identitet",
+                "reset_in_progress": "Återställning pågår …",
+                "session_id": "Sessions-ID:",
+                "session_key": "Sessionsnyckel:",
+                "title": "Avancerad"
+            },
+            "delete_key_storage": {
+                "breadcrumb_page": "Radera nyckellagring",
+                "confirm": "Radera nyckellagring",
+                "description": "Om du raderar nyckelförvaringen tas din kryptografiska identitet och dina meddelandenycklar bort från servern och följande säkerhetsfunktioner stängs av:",
+                "list_first": "Du kommer inte att ha krypterad meddelandehistorik på nya enheter",
+                "list_second": "Du kommer att förlora åtkomst till dina krypterade meddelanden om du loggas ut från %(brand)s överallt",
+                "title": "Är du säker på att du vill stänga av nyckellagring och radera den?"
+            },
+            "device_not_verified_button": "Verifiera den här enheten",
+            "device_not_verified_description": "Du måste verifiera den här enheten för att se dina krypteringsinställningar.",
+            "device_not_verified_title": "Enhet inte verifierad",
+            "dialog_title": "<strong>Inställningar:</strong> Kryptering",
+            "key_storage": {
+                "allow_key_storage": "Tillåt nyckellagring",
+                "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. <a>Läs mer</a>",
+                "title": "Nyckellagring"
+            },
+            "recovery": {
+                "change_recovery_confirm_button": "Bekräfta ny återställningsnyckel",
+                "change_recovery_confirm_description": "Ange din nya återställningsnyckel nedan för att slutföra. Din gamla kommer inte att funka längre.",
+                "change_recovery_confirm_title": "Ange din nya återställningsnyckel",
+                "change_recovery_key": "Byt återställningsnyckel",
+                "change_recovery_key_description": "Skriv ner den här nya återställningsnyckeln någonstans säkert. Klicka sedan på Fortsätt för att bekräfta ändringen.",
+                "change_recovery_key_title": "Byt återställningsnyckel?",
+                "description": "Återställ din kryptografiska identitet och meddelandehistorik med en återställningsnyckel om du har tappat bort alla dina befintliga enheter.",
+                "enter_key_error": "Återställningsnyckeln du angav är inte korrekt.",
+                "enter_recovery_key": "Ange återställningsnyckel",
+                "forgot_recovery_key": "Glömt återställningsnyckeln?",
+                "key_storage_warning": "Din nyckellagring är inte synkroniserad. Klicka på knappen nedan för att åtgärda problemet.",
+                "save_key_description": "Dela inte detta med någon!",
+                "save_key_title": "Återställningsnyckel",
+                "set_up_recovery": "Konfigurera återställning",
+                "set_up_recovery_confirm_button": "Slutför inställningen",
+                "set_up_recovery_confirm_description": "Ange återställningsnyckeln som visas på föregående skärm för att slutföra inställningen av återställningen.",
+                "set_up_recovery_confirm_title": "Ange din återställningsnyckel för att bekräfta",
+                "set_up_recovery_description": "Din nyckellagring skyddas av en återställningsnyckel. Om du behöver en ny återställningsnyckel efter installationen kan du återskapa den genom att välja ”%(changeRecoveryKeyButton)s”.",
+                "set_up_recovery_save_key_description": "Skriv ner den här återställningsnyckeln någonstans säkert, som en lösenordshanterare, krypterad anteckning eller ett fysiskt kassaskåp.",
+                "set_up_recovery_save_key_title": "Spara din återställningsnyckel på ett säkert ställe",
+                "set_up_recovery_secondary_description": "När du har klickat på Fortsätt genererar vi en återställningsnyckel åt dig.",
+                "title": "Återställa"
+            },
+            "title": "Kryptering"
+        },
         "general": {
             "account_management_section": "Kontohantering",
             "account_section": "Konto",
@@ -2412,7 +2583,7 @@
             "add_msisdn_instructions": "Ett SMS har skickats till +%(msisdn)s. Ange verifieringskoden som det innehåller.",
             "add_msisdn_misconfigured": "Flöde för tilläggning/bindning med MSISDN är felkonfigurerat",
             "allow_spellcheck": "Tillåt stavningskontroll",
-            "application_language": "Språk för ansökan",
+            "application_language": "Applikationsspråk",
             "application_language_reload_hint": "Appen laddas om efter att ha valt ett annat språk",
             "avatar_remove_progress": "Tar bort bild...",
             "avatar_save_progress": "Laddar upp bild...",
@@ -2484,7 +2655,6 @@
             "unable_to_load_msisdns": "Det går inte att läsa in telefonnummer",
             "username": "Användarnamn"
         },
-        "image_thumbnails": "Visa förhandsgranskning/miniatyr för bilder",
         "inline_url_previews_default": "Aktivera inbäddad URL-förhandsgranskning som standard",
         "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)",
@@ -2547,6 +2717,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Inställningar:</strong> Ignorerade användare"
         },
+        "media_preview": {
+            "hide_avatars": "Dölj avatarer för rum och inbjudare",
+            "hide_media": "Dölj alltid",
+            "media_preview_description": "En dold media kan alltid visas genom att trycka på den",
+            "media_preview_label": "Visa media i tidslinjen",
+            "show_in_private": "I privata rum",
+            "show_media": "Visa alltid"
+        },
         "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)",
@@ -2632,57 +2810,20 @@
         "prompt_invite": "Fråga innan inbjudningar skickas till potentiellt ogiltiga Matrix-ID:n",
         "replace_plain_emoji": "Ersätt automatiskt textemotikoner med emojier",
         "security": {
-            "4s_public_key_in_account_data": "i kontodata",
-            "4s_public_key_status": "Publik nyckel för hemlig lagring:",
             "analytics_description": "Dela anonyma data för att hjälpa oss att identifiera problem. Inget personligt. Inga tredje parter.",
-            "backup_key_cached_status": "Cachad säkerhetskopieringsnyckel:",
-            "backup_key_stored_status": "Lagrad säkerhetskopieringsnyckel:",
-            "backup_key_unexpected_type": "oväntad typ",
-            "backup_key_well_formed": "välformaterad",
-            "backup_keys_description": "Säkerhetskopiera dina krypteringsnycklar med din kontodata ifall du skulle förlora åtkomst till dina sessioner. Dina nycklar kommer att säkras med en unik säkerhetsnyckel.",
             "bulk_options_accept_all_invites": "Acceptera alla %(invitedRooms)s inbjudningar",
             "bulk_options_reject_all_invites": "Avböj alla %(invitedRooms)s inbjudningar",
             "bulk_options_section": "Massalternativ",
-            "cross_signing_cached": "cachad lokalt",
-            "cross_signing_homeserver_support": "Hemserverns funktionsstöd:",
-            "cross_signing_homeserver_support_exists": "existerar",
-            "cross_signing_in_4s": "i hemlig lagring",
-            "cross_signing_in_memory": "i minne",
-            "cross_signing_master_private_Key": "Privat huvudnyckel:",
-            "cross_signing_not_cached": "inte hittad lokalt",
-            "cross_signing_not_found": "hittades inte",
-            "cross_signing_not_in_4s": "hittades inte i lagring",
-            "cross_signing_not_stored": "inte lagrad",
-            "cross_signing_private_keys": "Privata nycklar för korssignering:",
-            "cross_signing_public_keys": "Publika nycklar för korssignering:",
-            "cross_signing_self_signing_private_key": "Privat nyckel för självsignering:",
-            "cross_signing_user_signing_private_key": "Privat nyckel för användarsignering:",
-            "cryptography_section": "Kryptografi",
             "dehydrated_device_description": "Funktionen offlineenhet låter dig ta emot krypterade meddelanden även när du inte är inloggad på någon enhet",
             "dehydrated_device_enabled": "Offlineenhet aktiverad",
-            "delete_backup": "Radera säkerhetskopia",
-            "delete_backup_confirm_description": "Är du säker? Du kommer att förlora dina krypterade meddelanden om dina nycklar inte säkerhetskopieras ordentligt.",
             "dialog_title": "<strong>Inställningar:</strong> Säkerhet och integritet",
             "e2ee_default_disabled_warning": "Din serveradministratör har inaktiverat totalsträckskryptering som förval för privata rum och direktmeddelanden.",
             "enable_message_search": "Aktivera meddelandesökning i krypterade rum",
             "encryption_section": "Kryptering",
-            "error_loading_key_backup_status": "Kunde inte ladda status för nyckelsäkerhetskopiering",
-            "export_megolm_keys": "Exportera krypteringsrumsnycklar",
             "ignore_users_empty": "Du har inga ignorerade användare.",
             "ignore_users_section": "Ignorerade användare",
-            "import_megolm_keys": "Importera rumskrypteringsnycklar",
-            "key_backup_active": "Den här sessionen säkerhetskopierar dina nycklar.",
-            "key_backup_active_version": "Aktiv säkerhetskopieringsversion:",
-            "key_backup_active_version_none": "Ingen",
             "key_backup_algorithm": "Algoritm:",
-            "key_backup_can_be_restored": "Säkerhetskopian kan återställas på den här sessionen",
-            "key_backup_complete": "Alla nycklar säkerhetskopierade",
             "key_backup_connect": "Anslut den här sessionen till nyckelsäkerhetskopiering",
-            "key_backup_connect_prompt": "Anslut den här sessionen till nyckelsäkerhetskopiering innan du loggar ut för att undvika att du blir av med nycklar som kanske bara finns på den här sessionen.",
-            "key_backup_in_progress": "Säkerhetskopierar %(sessionsRemaining)s nycklar …",
-            "key_backup_inactive": "Den här servern <b>säkerhetskopierar inte dina nycklar</b>, men du har en existerande säkerhetskopia du kan återställa ifrån och lägga till till i framtiden.",
-            "key_backup_inactive_warning": "Dina nycklar <b>säkerhetskopieras inte från den här sessionen</b>.",
-            "key_backup_latest_version": "Senaste säkerhetskopieringsversionen på servern:",
             "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": {
@@ -2702,13 +2843,7 @@
             "message_search_unsupported": "%(brand)s saknar vissa komponenter som krävs som krävs för att säkert cacha krypterade meddelanden lokalt. Om du vill experimentera med den här funktionen, bygg en anpassad %(brand)s Skrivbord med <nativeLink>sökkomponenter tillagda</nativeLink>.",
             "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",
-            "restore_key_backup": "Återställ från säkerhetskopia",
-            "secret_storage_not_ready": "inte klart",
-            "secret_storage_ready": "klart",
-            "secret_storage_status": "Hemlig lagring:",
             "send_analytics": "Skicka statistik",
-            "session_id": "Sessions-ID:",
-            "session_key": "Sessionsnyckel:",
             "strict_encryption": "Skicka aldrig krypterade meddelanden till overifierade sessioner från den här sessionen"
         },
         "send_read_receipts": "Skicka läskvitton",
@@ -2757,6 +2892,7 @@
             "inactive_sessions_list_description": "Överväg att logga ut ur gamla sessioner (%(inactiveAgeDays)s dagar eller äldre) du inte använder längre.",
             "ip": "IP-adress",
             "last_activity": "Senaste aktiviteten",
+            "manage": "Hantera denna session",
             "mobile_session": "Mobil session",
             "n_sessions_selected": {
                 "one": "%(count)s session vald",
@@ -2950,8 +3086,6 @@
         "topic": "Hämtar eller sätter ämnet för ett rum",
         "topic_none": "Det här rummet har inget ämne.",
         "topic_room_error": "Misslyckades att hitta rumsämne: Kunde inte hitta rummet (%(roomId)s)",
-        "tovirtual": "Byter till det här rummets virtuella rum, om det har ett",
-        "tovirtual_not_found": "Inget virtuellt rum för det här rummet",
         "unban": "Avbannar användaren med givet ID",
         "unflip": "Lägger till ┬──┬ ノ( ゜-゜ノ) till början av ett textmeddelande",
         "unholdcall": "Avslutar parkering av samtalet i det nuvarande samtalet",
@@ -2969,6 +3103,7 @@
         "view": "Visar rum med den angivna adressen",
         "whois": "Visar information om en användare"
     },
+    "sliding_sync_legacy_no_longer_supported": "Äldre sliding sync stöds inte längre: logga ut och in igen för att aktivera den nya sliding sync-flaggan",
     "space": {
         "add_existing_room_space": {
             "create": "Vill du lägga till ett nytt rum istället?",
@@ -3073,7 +3208,6 @@
         "heading_without_query": "Sök efter",
         "join_button_text": "Gå med i %(roomAddress)s",
         "keyboard_scroll_hint": "Använd <arrows/> för att skrolla",
-        "message_search_section_title": "Andra sökningar",
         "other_rooms_in_space": "Andra rum i %(spaceName)s",
         "public_rooms_label": "Offentliga rum",
         "public_spaces_label": "Offentliga utrymmen",
@@ -3083,7 +3217,6 @@
         "result_may_be_hidden_privacy_warning": "Vissa resultat kan vara dolda av sekretesskäl",
         "result_may_be_hidden_warning": "Vissa resultat kanske är dolda",
         "search_dialog": "Sökdialog",
-        "search_messages_hint": "För att söka efter meddelanden, leta efter den här ikonen på toppen av ett rum <icon/>",
         "spaces_title": "Utrymmen du är med i",
         "start_group_chat_button": "Starta en gruppchatt"
     },
@@ -3132,9 +3265,7 @@
     "threads_activity_centre": {
         "header": "Aktivitet för trådar",
         "no_rooms_with_threads_notifs": "Du har inga rum med trådaviseringar ännu.",
-        "no_rooms_with_unread_threads": "Du har inga rum med olästa trådar än.",
-        "release_announcement_description": "Meddelanden om trådar har flyttats, du hittar dem här från och med nu.",
-        "release_announcement_header": "Aktivitetscenter för Trådar"
+        "no_rooms_with_unread_threads": "Du har inga rum med olästa trådar än."
     },
     "time": {
         "about_day_ago": "cirka en dag sedan",
@@ -3346,6 +3477,7 @@
             "left_reason": "%(targetName)s lämnade rummet: %(reason)s",
             "no_change": "%(senderName)s gjorde ingen ändring",
             "reject_invite": "%(targetName)s avböjde inbjudan",
+            "reject_invite_reason": "%(targetName)s avvisade inbjudan: %(reason)s",
             "remove_avatar": "%(senderName)s tog bort sin profilbild",
             "remove_name": "%(senderName)s tog bort sitt visningsnamn %(oldDisplayName)s",
             "set_avatar": "%(senderName)s satte en profilbild",
@@ -3382,11 +3514,13 @@
         },
         "m.room.tombstone": "%(senderDisplayName)s uppgraderade det här rummet.",
         "m.room.topic": {
-            "changed": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\"."
+            "changed": "%(senderDisplayName)s bytte rummets ämne till \"%(topic)s\".",
+            "removed": "%(senderDisplayName)s tog bort ämnet."
         },
         "m.sticker": "%(senderDisplayName)s skickade en dekal.",
         "m.video": {
-            "error_decrypting": "Fel vid avkryptering av video"
+            "error_decrypting": "Fel vid avkryptering av video",
+            "show_video": "Visa video"
         },
         "m.widget": {
             "added": "%(widgetName)s-widget har lagts till av %(senderName)s",
@@ -3642,10 +3776,10 @@
         "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"
+        "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",
@@ -3731,6 +3865,7 @@
         "unban_space_specific": "Avbanna dem från specifika saker jag kan",
         "unban_space_warning": "Personen kommer inte kunna komma åt saker du inte är admin för.",
         "unignore_button": "Avignorera",
+        "verification_unavailable": "Användarverifiering inte tillgänglig",
         "verify_button": "Verifiera användare",
         "verify_explainer": "För extra säkerhet, verifiera den här användaren genom att kolla en engångskod på båda era enheter."
     },
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index a183b580a3..20cc904f17 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -80,12 +80,14 @@
         "maximise": "Maksimize",
         "mention": "Sizden bahsediyor",
         "minimise": "Minimize",
+        "new_message": "Yeni mesaj",
         "new_room": "Yeni oda",
         "new_video_room": "Yeni video odası",
         "next": "İleri",
         "no": "Hayır",
         "ok": "Tamam",
         "open": "Aç",
+        "open_menu": "Menüyü aç",
         "pause": "Durdur",
         "pin": "PIN Kodu",
         "play": "Oynat",
@@ -94,7 +96,6 @@
         "react": "Tepki ver",
         "refresh": "Yenile",
         "register": "Kaydolun",
-        "reject": "Reddet",
         "reload": "Tekrar yükle",
         "remove": "Kaldır",
         "rename": "Yeniden adlandır",
@@ -405,6 +406,15 @@
         "download_logs": "Günlükleri indir",
         "downloading_logs": "Günlükler indiriliyor",
         "error_empty": "Lütfen neyin yanlış gittiğini bize bildirin ya da en güzeli problemi tanımlayan bir GitHub talebi oluşturun.",
+        "failed_download_logs": "Hata ayıklama günlükleri indirilemedi: ",
+        "failed_send_logs_causes": {
+            "disallowed_app": "Hata raporunuz reddedildi. rageshake sunucusu bu uygulamayı desteklemiyor.",
+            "rejected_generic": "Hata raporunuz reddedildi. Rageshake sunucusu, bir politika nedeniyle raporun içeriğini reddetti.",
+            "rejected_recovery_key": "Hata raporunuz bir kurtarma anahtarı içerdiği için güvenlik nedeniyle reddedildi.",
+            "rejected_version": "Çalıştırdığınız sürüm çok eski olduğu için hata raporunuz reddedildi.",
+            "server_unknown_error": "Rageshake sunucusu bilinmeyen bir hatayla karşılaştı ve raporu işleyemedi.",
+            "unknown_error": "Günlükler gönderilemedi."
+        },
         "github_issue": "GitHub sorunu",
         "introduction": "GitHub aracılığıyla bir hata bildirdiyseniz, hata ayıklama günlükleri sorunu bulmamızda yardımcı olabilir. ",
         "log_request": "Bunun gelecekte de olmasının önüne geçmek için lütfen <a>günceleri bize gönderin</a>.",
@@ -462,7 +472,6 @@
         "capabilities": "Yetenekler",
         "copied": "Kopyalandı!",
         "credits": "Katkıda Bulunanlar",
-        "cross_signing": "Çapraz-imzalama",
         "dark": "Karanlık",
         "description": "Açıklama",
         "deselect_all": "Tüm seçimleri kaldır",
@@ -874,44 +883,23 @@
     "empty_room_was_name": "Boş oda (%(oldName)s idi)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Devam etmek için Güvenlik İfadenizi girin veya <button>Güvenlik Anahtarınızı kullanın</button>.",
             "key_validation_text": {
-                "invalid_security_key": "Geçersiz Güvenlik Anahtarı",
-                "recovery_key_is_correct": "Güzel görünüyor!",
-                "wrong_file_type": "Yanlış dosya türü",
                 "wrong_security_key": "Yanlış Güvenlik Anahtarı"
             },
-            "reset_title": "Hepsini sıfırla",
-            "reset_warning_1": "Bunu yalnızca doğrulamayı tamamlamak için başka bir cihazınız yoksa yapın.",
-            "reset_warning_2": "Her şeyi sıfırlarsanız, güvenilen oturumlar ve güvenilen kullanıcılar olmadan yeniden başlarsınız ve geçmiş mesajları göremeyebilirsiniz.",
             "restoring": "Anahtarları yedekten geri yükle",
-            "security_key_title": "Güvenlik anahtarı",
-            "security_phrase_incorrect_error": "Gizli depolama alanına erişilemiyor. Lütfen doğru Güvenlik İfadesini girdiğinizi doğrulayın.",
-            "security_phrase_title": "Güvenlik İfadesi",
-            "separator": "%(securityKey)s veya %(recoveryFile)s",
-            "use_security_key_prompt": "Devam etmek için Güvenlik Anahtarınızı kullanın."
+            "security_key_title": "Güvenlik 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_not_ready": "Çapraz imzalama ayarlanmamış.",
-        "cross_signing_ready": "Çapraz imzalama zaten kullanılıyor.",
-        "cross_signing_ready_no_backup": "Çapraz imzalama hazır ancak anahtarlar yedeklenmedi.",
         "cross_signing_room_normal": "Bu oda uçtan uça şifreli",
         "cross_signing_room_verified": "Bu odadaki herkes doğrulanmış",
         "cross_signing_room_warning": "Birisi bilinmeyen bir oturum kullanıyor",
-        "cross_signing_unsupported": "Ana sunucunuz çapraz imzalamayı desteklemiyor.",
-        "cross_signing_untrusted": "Hesabınız gizli belleğinde çapraz imzalama kimliği barındırıyor ancak bu oturumda daha kullanılmış değil.",
         "cross_signing_user_normal": "Bu kullanıcıyı doğrulamadınız.",
         "cross_signing_user_verified": "Bu kullanıcıyı doğruladınız. Bu kullanıcı tüm oturumlarını doğruladı.",
         "cross_signing_user_warning": "Bu kullanıcı bütün oturumlarında doğrulanmamış.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Çapraz-imzalama anahtarlarını temizle",
-            "title": "Çarpraz-imzalama anahtarlarını imha et?",
-            "warning": "Çapraz imzalama anahtarlarının silinmesi kalıcıdır. Doğrulama yaptığınız herkes güvenlik uyarıları görecektir. Çapraz imzalama yapabileceğiniz tüm cihazları kaybetmediğiniz sürece bunu yapmak istemezsiniz."
-        },
         "enter_recovery_key": "Kurtarma anahtarını girin",
         "event_shield_reason_authenticity_not_guaranteed": "Bu şifrelenmiş mesajın güvenilirliği bu cihazda garanti edilemez.",
         "event_shield_reason_mismatched_sender_key": "Doğrulanmamış bir oturum tarafından şifrelenmiş",
@@ -938,7 +926,6 @@
             "title": "Yeni Kurtarma Yöntemi",
             "warning": "Yeni kurtarma yöntemini ayarlamadı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 ayarlayın."
         },
-        "not_supported": "<Desteklenmiyor>",
         "pinned_identity_changed": "%(displayName)s'ın (<b>%(userId)s</b>) kimliği değişmiş gibi görünüyor. <a>Daha fazla bilgi </a>",
         "pinned_identity_changed_no_displayname": "<b>%(userId)s</b>'ın kimliği değişmiş gibi görünüyor. <a>Daha fazla bilgi </a>",
         "recovery_method_removed": {
@@ -954,8 +941,7 @@
         "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.",
-            "title": "Ayarla"
+            "explainer": "Anahtarlarını kaybetmemek için, çıkış yapmadan önce önleri yedekle."
         },
         "udd": {
             "interactive_verification_button": "Emoji ile etkileşimli olarak doğrula",
@@ -970,7 +956,6 @@
             "accepting": "Kabul ediyorum…",
             "after_new_login": {
                 "device_verified": "Cihaz doğrulandı",
-                "reset_confirmation": "Doğrulama anahtarlarını sıfırlamak istediğinizden emin misiniz?",
                 "skip_verification": "Şimdilik doğrulamayı atla",
                 "unable_to_verify": "Bu cihaz doğrulanamıyor",
                 "verify_this_device": "Bu cihazı doğrulayın"
@@ -1041,8 +1026,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_reset_warning_1": "Doğrulama anahtarlarınızı sıfırlama işlemi geri alınamaz. Sıfırladıktan sonra eski şifrelenmiş mesajlara erişiminiz olmaz ve sizi daha önce doğrulamış olan arkadaşlarınız, siz onlarla yeniden doğrulayana kadar güvenlik uyarıları görür.",
-            "verify_reset_warning_2": "Lütfen yalnızca diğer tüm cihazlarınızı ve Güvenlik Anahtarınızı kaybettiğinizden eminseniz devam edin.",
             "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",
@@ -1111,11 +1094,7 @@
             "title": "Oda bağlantısı kopyalanamıyor"
         },
         "error_loading_user_profile": "Kullanıcı profili yüklenemedi",
-        "forget_room_failed": "Oda unutulması başarısız oldu %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Sunucu kullanılamıyor , aşırı yüklenmiş veya arama zaman aşımına uğramış olabilir :(",
-            "title": "Arama başarısız"
-        }
+        "forget_room_failed": "Oda unutulması başarısız oldu %(errCode)s"
     },
     "error_user_not_logged_in": "Kullanıcı oturum açmadı",
     "event_preview": {
@@ -1240,6 +1219,7 @@
         "change": "Kimlik sunucusunu değiştir",
         "change_prompt": "<current /> kimlik sunucusundan bağlantı kesilip <new /> kimlik sunucusuna bağlanılsın mı?",
         "change_server_prompt": "Eğer <server /> kimlik sunucusunu kullanarak başkalarını bulmak ve başkalarını tarafından bulunabilmek istemiyorsanız aşağıya bir başka kimlik sunucusu giriniz.",
+        "changed": "Kimlik sunucunuz değiştirildi",
         "checking": "Sunucu kontrol ediliyor",
         "description_connected": "Şu anda <server></server> kimlik sunucusunu kullanarak başkalarını buluyorsunuz ve başkalarını tarafından bulunabiliyorsunuz. Aşağıdan kimlik sunucunuzu değiştirebilirsiniz.",
         "description_disconnected": "Şu anda herhangi bir kimlik sunucusu kullanmıyorsunuz. Başkalarını bulmak ve başkaları tarafından bulunabilmek için aşağıya bir kimlik sunucusu ekleyin.",
@@ -1282,7 +1262,9 @@
         "title": "%(brand)s bu tarayıcıyı desteklemiyor",
         "use_desktop_heading": "Bunun yerine %(brand)s Masaüstü kullanın",
         "use_mobile_heading": "Bunun yerine mobil cihazlarda %(brand)s kullanın",
-        "use_mobile_heading_after_desktop": "Veya mobil uygulamamızı kullanın"
+        "use_mobile_heading_after_desktop": "Veya mobil uygulamamızı kullanın",
+        "windows_64bit": "Windows (64 bit)",
+        "windows_arm_64bit": "Windows (ARM 64-bit)"
     },
     "info_tooltip_title": "Bilgi",
     "integration_manager": {
@@ -1291,6 +1273,7 @@
         "error_connecting_heading": "Entegrasyon yöneticisine bağlanılamadı",
         "explainer": "Bütünleştirme yöneticileri yapılandırma verilerini alır ve sizin adınıza widget'ları değiştirebilir, oda davetleri gönderebilir ve güç düzeylerini ayarlayabilir.",
         "manage_title": "Entegrasyonları yönet",
+        "toggle_label": "Entegrasyon yöneticisini etkinleştirin",
         "use_im": "Botları, görsel bileşenleri ve çıkartma paketlerini yönetmek için bir entegrasyon yöneticisi kullanın.",
         "use_im_default": "Botları, widget'ları ve çıkartma paketlerini yönetmek için bir bütünleştirme yöneticisi <b>(%(serverName)s)</b> kullanın."
     },
@@ -1492,6 +1475,7 @@
         "location_share_live_description": "Geçici uygulama. Konumlar oda geçmişinde kalır.",
         "mjolnir": "İnsanları görmezden gelmenin yeni yolları",
         "msc3531_hide_messages_pending_moderation": "Moderatörlerin onay bekleyen mesajları gizlemesine izin verin.",
+        "new_room_list": "Yeni oda listesini etkinleştir",
         "notification_settings": "Yeni Bildirim Ayarları",
         "notification_settings_beta_caption": "Bildirim ayarlarınızı değiştirmenin daha basit bir yolunu sunuyoruz. %(brand)s istediğiniz gibi özelleştirin.",
         "notification_settings_beta_title": "Bildirim Ayarları",
@@ -1765,11 +1749,6 @@
         "ongoing": "Siliniyor…",
         "reason_label": "Neden (İsteğe bağlı)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Daveti reddetmek istediğinizden emin misiniz ?",
-        "failed": "Davetiyeyi reddetme başarısız oldu",
-        "title": "Daveti Reddet"
-    },
     "report_content": {
         "description": "Bu mesajı bildirdiğinizde, benzersiz 'etkinlik kimliği' ev sunucunuzun yöneticisine gönderilir. Bu odadaki iletiler şifrelenmişse, ev sunucusu yöneticiniz ileti metnini okuyamaz veya herhangi bir dosya ya da resmi görüntüleyemez.",
         "disagree": "Katılmıyorum",
@@ -1975,7 +1954,6 @@
             "you_created": "Bu odayı oluşturdunuz."
         },
         "invite_email_mismatch_suggestion": "Davetiyeleri doğrudan %(brand)s adresinden almak için bu e-postayı Ayarlar'da paylaşın.",
-        "invite_reject_ignore": "Kullanıcıyı Reddet & Yoksay",
         "invite_sent_to_email": "Bu davet %(email)s adresine gönderildi",
         "invite_sent_to_email_room": "%(roomName)s odası daveti %(email)s adresine gönderildi",
         "invite_subtitle": "<userName/> davet etti",
@@ -2082,17 +2060,29 @@
         "failed_add_tag": "%(tagName)s etiketi odaya eklenemedi",
         "failed_remove_tag": "Odadan %(tagName)s etiketi kaldırılamadı",
         "failed_set_dm_tag": "Doğrudan mesaj etiketi ayarlanamadı",
+        "filters": {
+            "favourite": "Favoriler",
+            "people": "Kişiler",
+            "rooms": "Odalar",
+            "unread": "Okunmamış"
+        },
         "home_menu_label": "Ana sayfa seçenekleri",
         "join_public_room_label": "Herkese açık odaya katıl",
         "joining_rooms_status": {
             "one": "Şu anda %(count)s odaya katılıyor",
             "other": "Şu anda %(count)s odaya katılıyor"
         },
+        "list_title": "Oda listesi",
         "notification_options": "Bildirim ayarları",
+        "open_space_menu": "Açık alan menüsü",
+        "primary_filters": "Oda listesi filtreleri",
         "redacting_messages_status": {
             "one": "Şu anda %(count)s odadaki mesajlar kaldırılıyor",
             "other": "Şu anda %(count)s odadaki mesajlar kaldırılıyor"
         },
+        "room": {
+            "open_room": "Açık oda %(roomName)s"
+        },
         "show_less": "Daha az göster",
         "show_n_more": {
             "one": "%(count)s adet daha fazla göster",
@@ -2103,6 +2093,10 @@
         "sort_by_activity": "Aktivite",
         "sort_by_alphabet": "A-Z",
         "sort_unread_first": "Önce okunmamış mesajları olan odaları göster",
+        "space_menu": {
+            "home": "Alan ana sayfa",
+            "space_settings": "Alan Ayarları"
+        },
         "space_menu_label": "%(spaceName)s menü",
         "sublist_options": "Liste seçenekleri",
         "suggested_rooms_heading": "Önerilen Odalar"
@@ -2465,16 +2459,25 @@
                 "breadcrumb_title_forgot": "Kurtarma anahtarınızı mı unuttunuz? Kimliğinizi sıfırlamanız gerekecek.",
                 "breadcrumb_warning": "Bunu yalnızca hesabınızın tehlikeye girdiğini düşünüyorsanız yapın.",
                 "details_title": "Şifreleme detayları",
+                "do_not_close_warning": "Sıfırlama işlemi bitene kadar bu pencereyi kapatmayın",
                 "export_keys": "Anahtarları dışa aktar",
                 "import_keys": "Anahtarları içe aktar",
                 "other_people_device_description": "Şifrelenmiş odalarda varsayılan olarak, doğrulayana kadar kimseye şifrelenmiş mesajlar göndermeyin",
                 "other_people_device_label": "Doğrulanmamış cihazlara asla şifrelenmiş mesajlar göndermeyin",
                 "other_people_device_title": "Diğer kişilerin cihazları",
                 "reset_identity": "Şifreleme kimliğini sıfırla",
+                "reset_in_progress": "Sıfırlama devam ediyor...",
                 "session_id": "Oturum Kimliği:",
                 "session_key": "Oturum anahtarı:",
                 "title": "Gelişmiş"
             },
+            "delete_key_storage": {
+                "breadcrumb_page": "Anahtar depolamasını sil",
+                "confirm": "Anahtar depolamasını sil",
+                "description": "Anahtar depolamanın silinmesi kriptografik kimliğinizi ve mesaj anahtarlarınızı sunucudan kaldıracak ve aşağıdaki güvenlik özelliklerini kapatacaktır:",
+                "list_first": "Yeni cihazlarda şifrelenmiş mesaj geçmişine sahip olmayacaksınız",
+                "list_second": "%(brand)s adresinden her yerde oturumunuzu kapatırsanız şifrelenmiş mesajlarınıza erişiminizi kaybedersiniz"
+            },
             "device_not_verified_button": "Bu cihazı doğrulayın",
             "device_not_verified_description": "Şifreleme ayarlarınızı görüntülemek için bu cihazı doğrulamanız gerekiyor.",
             "device_not_verified_title": "Cihaz doğrulanmamış",
@@ -2590,7 +2593,6 @@
             "unable_to_load_msisdns": "Telefon numaraları yüklenemiyor",
             "username": "Kullanıcı Adı"
         },
-        "image_thumbnails": "Fotoğraflar için ön izleme/küçük resim göster",
         "inline_url_previews_default": "Varsayılan olarak satır içi URL önizlemeleri aç",
         "inline_url_previews_room": "Bu odadaki katılımcılar için URL önizlemeyi varsayılan olarak açık hale getir",
         "inline_url_previews_room_account": "Bu oda için URL önizlemeyi aç (sadece sizi etkiler)",
@@ -2738,57 +2740,20 @@
         "prompt_invite": "Potansiyel olarak geçersiz matrix kimliği olanlara davet gönderirken uyarı ver",
         "replace_plain_emoji": "Düz metini otomatik olarak emoji ile değiştir",
         "security": {
-            "4s_public_key_in_account_data": "hesap verisinde",
-            "4s_public_key_status": "Gizli depolama açık anahtarı:",
             "analytics_description": "Sorunları belirlememize yardımcı olmak için anonim verileri paylaşın. Kişisel hiçbir şey yok. Üçüncü taraflar yok.",
-            "backup_key_cached_status": "Yedekleme anahtarı önbelleğe alındı:",
-            "backup_key_stored_status": "Yedekleme anahtarı depolandı:",
-            "backup_key_unexpected_type": "Bilinmeyen tür",
-            "backup_key_well_formed": "uygun biçimlendirilmiş",
-            "backup_keys_description": "Olası bir oturuma erişememe durumunu önlemek için şifreleme anahtarlarınızı hesap verilerinizle yedekleyin. Anahtarlarınız eşsiz bir güvenlik anahtarı ile güvenlenecektir.",
             "bulk_options_accept_all_invites": "Bütün %(invitedRooms)s davetlerini kabul et",
             "bulk_options_reject_all_invites": "Tüm %(invitedRooms)s davetlerini reddet",
             "bulk_options_section": "Toplu işlem seçenekleri",
-            "cross_signing_cached": "yerel olarak önbelleğe alındı",
-            "cross_signing_homeserver_support": "Ana sunucu özellik desteği:",
-            "cross_signing_homeserver_support_exists": "mevcut",
-            "cross_signing_in_4s": "gizli depoda",
-            "cross_signing_in_memory": "hafızada",
-            "cross_signing_master_private_Key": "Ana gizli anahtar",
-            "cross_signing_not_cached": "yerel olarak bulunamadı",
-            "cross_signing_not_found": "bulunamadı",
-            "cross_signing_not_in_4s": "Cihazda bulunamadı",
-            "cross_signing_not_stored": "depolanmadı",
-            "cross_signing_private_keys": "Çarpraz-imzalama gizli anahtarları:",
-            "cross_signing_public_keys": "Çarpraz-imzalama açık anahtarları:",
-            "cross_signing_self_signing_private_key": "Kendinden imzalı özel anahtar:",
-            "cross_signing_user_signing_private_key": "Kullanıcı imzalı özel anahtar",
-            "cryptography_section": "Kriptografi",
             "dehydrated_device_description": "Çevrimdışı cihaz özelliği, herhangi bir cihazda oturum açmamış olsanız bile şifreli mesajlar almanızı sağlar",
             "dehydrated_device_enabled": "Çevrimdışı cihaz etkin",
-            "delete_backup": "Yedeklemeyi Sil",
-            "delete_backup_confirm_description": "Emin misiniz? Eğer anahtarlarınız doğru bir şekilde yedeklemediyse, şifrelenmiş iletilerinizi kaybedeceksiniz.",
             "dialog_title": "<strong>Ayarlar:</strong> Güvenlik ve Gizlilik",
             "e2ee_default_disabled_warning": "Sunucu yönetinciniz varsayılan olarak odalarda ve doğrudandan iletilerde uçtan uca şifrelemeyi kapadı.",
             "enable_message_search": "Şifrelenmiş odalardaki mesaj aramayı aktifleştir",
             "encryption_section": "Şifreleme",
-            "error_loading_key_backup_status": "Anahtar yedek durumu yüklenemiyor",
-            "export_megolm_keys": "Uçtan uca Oda anahtarlarını Dışa Aktar",
             "ignore_users_empty": "Yok saydığınız kullanıcı yok.",
             "ignore_users_section": "Yoksayılan kullanıcılar",
-            "import_megolm_keys": "Uçtan uca Oda Anahtarlarını İçe Aktar",
-            "key_backup_active": "Bu oturum anahtarlarınızı yedekliyor.",
-            "key_backup_active_version": "Aktif yedek sürümü:",
-            "key_backup_active_version_none": "Yok",
             "key_backup_algorithm": "Algoritma:",
-            "key_backup_can_be_restored": "Bu yedek, bu oturumda geri yüklenebilir",
-            "key_backup_complete": "Bütün yedekler yedeklendi",
             "key_backup_connect": "Anahtar Yedekleme için bu oturuma bağlanın",
-            "key_backup_connect_prompt": "Yalnızca bu oturumda olabilecek anahtarları kaybetmemek için, oturumu kapatmadan önce bu oturumu anahtar yedeklemeye bağlayın.",
-            "key_backup_in_progress": "%(sessionsRemaining)s anahtar yedekleniyor…",
-            "key_backup_inactive": "Bu oturum <b> anahtarlarınızı yedeklemiyor</b>, ama zaten geri yükleyebileceğiniz ve ileride ekleyebileceğiniz bir yedeğiniz var.",
-            "key_backup_inactive_warning": "Anahtarlarınız <b>bu oturum tarafından yedeklenmiyor</b>.",
-            "key_backup_latest_version": "Sunucudaki en son yedek sürümü:",
             "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": {
@@ -2808,13 +2773,7 @@
             "message_search_unsupported": "%(brand)s, şifrelenmiş iletileri yerel olarak güvenli bir şekilde önbelleğe almak için gereken bazı bileşenlerden yoksun. Bu özelliği denemek istiyorsanız, <nativeLink> arama bileşenlerinin eklendiği</nativeLink> özel bir masaüstü oluşturun.",
             "message_search_unsupported_web": "%(brand)s internet tarayıcısında çalışıyorken şifrelenmiş mesajları güvenli bir şekilde önbelleğe alamaz. Şifrelenmiş mesajların arama sonucunda görünmesi için <desktopLink>%(brand)s Masaüstü</desktopLink> kullanın.",
             "record_session_details": "Oturum yöneticisinde oturumları daha kolay tanımak için istemci adı, sürümü ve URL'yi kaydet",
-            "restore_key_backup": "Yedekten Geri Dön",
-            "secret_storage_not_ready": "hazır değil",
-            "secret_storage_ready": "hazır",
-            "secret_storage_status": "Gizli depolama:",
             "send_analytics": "Analiz verilerini gönder",
-            "session_id": "Oturum ID:",
-            "session_key": "Oturum anahtarı:",
             "strict_encryption": "Bu oturumdan doğrulanmamış oturumlara asla şifreli mesaj göndermeyin"
         },
         "send_read_receipts": "Okundu bilgisi gönder",
@@ -3057,8 +3016,6 @@
         "topic": "Oda başlığını getirir yada ayarlar",
         "topic_none": "Bu odanın başlığı yok.",
         "topic_room_error": "Oda konusu alınamadı: Oda bulunamadı (%(roomId)s",
-        "tovirtual": "Varsa, bu odanın sanal odasına geçer",
-        "tovirtual_not_found": "Bu oda için sanal oda yok",
         "unban": "Verilen ID ile kullanıcı yasağını kaldırır",
         "unflip": "Düz metin mesajının başına ┬──┬ ノ (゜ - ゜ ノ) ekler",
         "unholdcall": "Mevcut odadaki aramayı beklemeden çıkarır",
@@ -3180,7 +3137,6 @@
         "heading_without_query": "Ara",
         "join_button_text": "Katıl %(roomAddress)s",
         "keyboard_scroll_hint": "Kaydırmak için <arrows/> kullanın",
-        "message_search_section_title": "Diğer aramalar",
         "other_rooms_in_space": "%(spaceName)s alanındaki diğer odalar",
         "public_rooms_label": "Herkese açık odalar",
         "public_spaces_label": "Herkese açık alanlar",
@@ -3190,7 +3146,6 @@
         "result_may_be_hidden_privacy_warning": "Bazı sonuçlar gizlilik için gizlenmiş olabilir",
         "result_may_be_hidden_warning": "Bazı sonuçlar gizlenmiş olabilir",
         "search_dialog": "Arama İletişim Kutusu",
-        "search_messages_hint": "Mesajları aramak için odanın üst kısmında bu simgeye tıklayın <icon/>",
         "spaces_title": "Bulunduğunuz alanlar",
         "start_group_chat_button": "Grup sohbeti başlat"
     },
@@ -3239,9 +3194,7 @@
     "threads_activity_centre": {
         "header": "Mesaj dizileri etkinliği",
         "no_rooms_with_threads_notifs": "Henüz mesaj dizisi bildirimleri olan odalarınız yok.",
-        "no_rooms_with_unread_threads": "Henüz okunmamış mesaj dizilerinin bulunduğu odalarınız yok.",
-        "release_announcement_description": "Mesaj dizisi bildirimleri taşındı, bundan sonra burada bulabilirsiniz.",
-        "release_announcement_header": "Mesaj Dizileri Etkinlik Merkezi"
+        "no_rooms_with_unread_threads": "Henüz okunmamış mesaj dizilerinin bulunduğu odalarınız yok."
     },
     "time": {
         "about_day_ago": "yaklaşık bir gün önce",
@@ -3453,6 +3406,7 @@
             "left_reason": "%(targetName)s odadan çıktı: %(reason)s",
             "no_change": "%(senderName)s hiçbir değişiklik yapmadı",
             "reject_invite": "%(targetName)s daveti geri çevirdi",
+            "reject_invite_reason": "%(targetName)s daveti reddetti: %(reason)s",
             "remove_avatar": "%(senderName)s profil resmini kaldırdı",
             "remove_name": "%(senderName)s, %(oldDisplayName)s görünür adını kaldırdı",
             "set_avatar": "%(senderName)s profil resmi belirledi",
@@ -3835,6 +3789,7 @@
         "unban_space_specific": "Yasaklarını kaldırabileceğim belirli yerlerden yasaklarını kaldır",
         "unban_space_warning": "Yönetici olmadığınız hiçbir şeye erişemezler.",
         "unignore_button": "Görmezden Gelmeyi Kaldır",
+        "verification_unavailable": "Kullanıcı doğrulaması kullanılamıyor",
         "verify_button": "Kullanıcıyı Doğrula",
         "verify_explainer": "Ekstra güvenlik için, her iki cihazınızda da tek seferlik bir kodu kontrol ederek bu kullanıcıyı doğrulayın."
     },
@@ -4041,7 +3996,7 @@
         "error_need_to_be_logged_in": "Oturum açmanız gerekiyor.",
         "error_unable_start_audio_stream_description": "Ses akışı başlatılamıyor.",
         "error_unable_start_audio_stream_title": "Canlı yayın başlatılamadı",
-        "modal_data_warning": "Bu ekrandaki veriler %(widgetDomain)s ile paylaşılıyor.",
+        "modal_data_warning": "Aşağıdaki veriler şu kişilerle paylaşılmaktadır:%(widgetDomain)s",
         "modal_title_default": "Modal Widget",
         "no_name": "Bilinmeyen uygulama",
         "open_id_permissions_dialog": {
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index a1fb364d74..175f9fa7d6 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -57,6 +57,8 @@
         "create_a_room": "Створити кімнату",
         "create_account": "Створити обліковий запис",
         "decline": "Відхилити",
+        "decline_and_block": "Відхилити та заблокувати",
+        "decline_invite": "Відхилити запрошення",
         "delete": "Видалити",
         "deny": "Відхилити",
         "disable": "Вимкнути",
@@ -109,7 +111,6 @@
         "react": "Відреагувати",
         "refresh": "Оновити",
         "register": "Зареєструватися",
-        "reject": "Відмовитись",
         "reload": "Перезавантажити",
         "remove": "Прибрати",
         "rename": "Перейменувати",
@@ -387,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": "Введіть отриманий код:",
@@ -488,7 +490,6 @@
         "capabilities": "Можливості",
         "copied": "Скопійовано!",
         "credits": "Подяки",
-        "cross_signing": "Перехресне підписування",
         "dark": "Темна",
         "description": "Опис",
         "deselect_all": "Скасувати вибір",
@@ -527,6 +528,7 @@
         "message_timestamp_invalid": "Недійсна позначка часу",
         "microphone": "Мікрофон",
         "model": "Модель",
+        "moderation_and_safety": "Модерування й безпека",
         "modern": "Сучасний",
         "mute": "Стишити",
         "n_members": {
@@ -748,6 +750,13 @@
         "twemoji": "Стиль емоджі <twemoji>Twemoji</twemoji> від © <author>Twitter, Inc та інших учасників</author> використовується на умовах <terms>CC-BY 4.0</terms>.",
         "twemoji_colr": "Шрифт <colr>wemoji-colr</colr> від © <author>Mozilla Foundation</author> використовується на умовах <terms>Apache 2.0</terms>."
     },
+    "decline_invitation_dialog": {
+        "confirm": "Ви впевнені, що хочете відхилити запрошення приєднатися до \"%(roomName)s\"?",
+        "ignore_user_help": "Ви не бачитимете повідомлень або запрошень до кімнат від цього користувача.",
+        "reason_description": "Опишіть причину скарги на room.",
+        "report_room_description": "Поскаржитися на цю кімнату постачальнику облікового запису.",
+        "title": "Відхилити запрошення"
+    },
     "desktop_default_device_name": "%(brand)s для комп'ютера: %(platformName)s",
     "devtools": {
         "active_widgets": "Активні віджети",
@@ -849,6 +858,9 @@
         "setting_colon": "Налаштування:",
         "setting_definition": "Означення налаштування:",
         "setting_id": "ID налаштувань",
+        "settings": {
+            "elementCallUrl": "URL Element Call"
+        },
         "settings_explorer": "Налаштування оглядача",
         "show_hidden_events": "Показувати приховані події у часоряді",
         "spaces": {
@@ -901,44 +913,23 @@
     "empty_room_was_name": "Порожня кімната (були %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Щоб продовжити, введіть свою фразу безпеки або <button>скористайтесь ключем відновлення</button>.",
             "key_validation_text": {
-                "invalid_security_key": "Недійсний ключ відновлення",
-                "recovery_key_is_correct": "Виглядає файно!",
-                "wrong_file_type": "Тип файлу не підтримується",
                 "wrong_security_key": "Неправильний ключ відновлення"
             },
-            "reset_title": "Скинути все",
-            "reset_warning_1": "Робіть це лише якщо у вас немає іншого пристрою для виконання перевірки.",
-            "reset_warning_2": "Якщо ви скинете все, то почнете заново без довірених сеансів, користувачів і доступу до минулих повідомлень.",
             "restoring": "Відновлення ключів із резервної копії",
-            "security_key_title": "Ключ відновлення",
-            "security_phrase_incorrect_error": "Не вдалося зайти до таємного сховища. Переконайтеся, що ввели правильну фразу безпеки.",
-            "security_phrase_title": "Фраза безпеки",
-            "separator": "%(securityKey)s або %(recoveryFile)s",
-            "use_security_key_prompt": "Щоб продовжити, скористайтеся ключем відновлення."
+            "security_key_title": "Ключ відновлення"
         },
         "bootstrap_title": "Налаштовування ключів",
         "cancel_entering_passphrase_description": "Ви точно хочете скасувати введення парольної фрази?",
         "cancel_entering_passphrase_title": "Скасувати введення парольної фрази?",
         "confirm_encryption_setup_body": "Клацніть на кнопку внизу, щоб підтвердити налаштування шифрування.",
         "confirm_encryption_setup_title": "Підтвердити налаштування шифрування",
-        "cross_signing_not_ready": "Перехресне підписування не налаштовано.",
-        "cross_signing_ready": "Перехресне підписування готове до користування.",
-        "cross_signing_ready_no_backup": "Перехресне підписування готове, але резервна копія ключів не створюється.",
         "cross_signing_room_normal": "Ця кімната є наскрізно зашифрованою",
         "cross_signing_room_verified": "Усі в цій кімнаті звірені",
         "cross_signing_room_warning": "Хтось користується невідомим сеансом",
-        "cross_signing_unsupported": "Ваш домашній сервер не підтримує перехресного підписування.",
-        "cross_signing_untrusted": "Ваш обліковий запис має перехресне підписування особи у таємному сховищі, але цей сеанс йому ще не довіряє.",
         "cross_signing_user_normal": "Ви не звіряли цього користувача.",
         "cross_signing_user_verified": "Ви звірили цього користувача. Цей користувач звірив усі свої сеанси.",
         "cross_signing_user_warning": "Цей користувач звірив не всі свої сеанси.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Очистити ключі перехресного підписування",
-            "title": "Знищити ключі перехресного підписування?",
-            "warning": "Видалення ключів перехресного підписування безповоротне. Усі, з ким ви звірили сеанси, бачитимуть сповіщення системи безпеки. Ви майже напевно не захочете цього робити, якщо тільки ви не втратили всі пристрої, з яких можна виконувати перехресне підписування."
-        },
         "enter_recovery_key": "Введіть ключ відновлення",
         "event_shield_reason_authenticity_not_guaranteed": "Справжність цього зашифрованого повідомлення не може бути гарантованою на цьому пристрої.",
         "event_shield_reason_mismatched_sender_key": "Зашифроване незвіреним сеансом",
@@ -965,7 +956,6 @@
             "title": "Новий метод відновлення",
             "warning": "Якщо ви не встановлювали нового способу відновлення, ймовірно хтось намагається зламати ваш обліковий запис. Негайно змініть пароль до свого облікового запису й встановіть новий спосіб відновлення в налаштуваннях."
         },
-        "not_supported": "<не підтримується>",
         "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": {
@@ -981,8 +971,7 @@
         "set_up_toast_description": "Захистіться від втрати доступу до зашифрованих повідомлень і даних",
         "set_up_toast_title": "Налаштувати захищене резервне копіювання",
         "setup_secure_backup": {
-            "explainer": "Створіть резервну копію ключів перед виходом, щоб не втратити їх.",
-            "title": "Налаштувати"
+            "explainer": "Створіть резервну копію ключів перед виходом, щоб не втратити їх."
         },
         "udd": {
             "interactive_verification_button": "Звірити інтерактивно за допомогою емоджі",
@@ -997,7 +986,6 @@
             "accepting": "Прийняття…",
             "after_new_login": {
                 "device_verified": "Пристрій звірено",
-                "reset_confirmation": "Точно скинути ключі звірки?",
                 "skip_verification": "На разі пропустити звірку",
                 "unable_to_verify": "Не вдалося звірити цей пристрій",
                 "verify_this_device": "Звірити цей пристрій"
@@ -1068,8 +1056,6 @@
             "verify_emoji_prompt": "Звірити порівнянням унікальних емодзі.",
             "verify_emoji_prompt_qr": "Якщо ви не можете сканувати зазначений код, звірте порівнянням унікальних емодзі.",
             "verify_later": "Звірю пізніше",
-            "verify_reset_warning_1": "Скидання ключів звірки неможливо скасувати. Після скидання, ви втратите доступ до старих зашифрованих повідомлень, а всі друзі, які раніше вас звіряли, бачитимуть застереження безпеки, поки ви не проведете звірку з ними знову.",
-            "verify_reset_warning_2": "Будь ласка, продовжуйте лише в разі втрати всіх своїх інших пристроїв та ключа відновлення.",
             "verify_using_device": "Звірити за допомогою іншого пристрою",
             "verify_using_key": "Верифікувати за допомогою ключа відновлення",
             "verify_using_key_or_phrase": "Верифікувати за допомогою фрази або ключа відновлення",
@@ -1138,11 +1124,7 @@
             "title": "Не вдалося скопіювати посилання на кімнату"
         },
         "error_loading_user_profile": "Не вдалося звантажити профіль користувача",
-        "forget_room_failed": "Не вдалось видалити кімнату %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Сервер може бути недосяжним, перевантаженим або запит на пошук застарів :(",
-            "title": "Пошук не вдався"
-        }
+        "forget_room_failed": "Не вдалось видалити кімнату %(errCode)s"
     },
     "error_user_not_logged_in": "Користувач не увійшов",
     "event_preview": {
@@ -1678,6 +1660,7 @@
         "class_global": "Глобально",
         "class_other": "Інше",
         "default": "Типовий",
+        "default_settings": "Згідно з усталеними налаштуваннями",
         "email_pusher_app_display_name": "Сповіщення е-поштою",
         "enable_prompt_toast_description": "Увімкнути сповіщення стільниці",
         "enable_prompt_toast_title": "Сповіщення",
@@ -1696,7 +1679,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 робить запит на звірення"
@@ -1798,11 +1782,6 @@
         "ongoing": "Вилучення…",
         "reason_label": "Причина (не обов'язково)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Ви впевнені, що хочете відхилити запрошення?",
-        "failed": "Не вдалось відхилити запрошення",
-        "title": "Відхилити запрошення"
-    },
     "report_content": {
         "description": "Зі скаргою на це повідомлення буде надіслано його унікальний «ID події» адміністраторові вашого домашнього сервера. Якщо повідомлення у цій кімнаті зашифровані, то адміністратор не зможе побачити ані тексту повідомлень, ані жодних файлів чи зображень.",
         "disagree": "Відхилити",
@@ -1810,7 +1789,7 @@
         "hide_messages_from_user": "Виберіть, чи хочете ви сховати всі поточні та майбутні повідомлення від цього користувача.",
         "ignore_user": "Нехтувати користувача",
         "illegal_content": "Протиправний вміст",
-        "missing_reason": "Будь ласка, вкажіть, чому ви скаржитеся.",
+        "missing_reason": "Будь ласка, вкажіть причину скарги.",
         "nature": "Оберіть природу й опишіть, що образливого в цьому повідомленні.",
         "nature_disagreement": "Те, що пише цей користувач, неправильно.\nПро це буде повідомлено модераторам кімнати.",
         "nature_illegal": "Користувач порушує закон, наприклад зливає особисті дані людей чи погрожує насиллям.\nМодератори кімнати отримають скаргу на це й зможуть передати її правоохоронцям.",
@@ -1826,10 +1805,8 @@
         "toxic_behaviour": "Токсична поведінка"
     },
     "report_room": {
-        "description": "Поскаржитися на цю кімнату адміністратору домашнього сервера. Це надішле унікальний ID кімнати, але якщо повідомлення зашифровані, адміністратор не зможе прочитати їх або переглянути спільні файли.",
-        "reason_placeholder": "Причина для скарги...",
-        "sent": "Вашу скаргу надіслано.",
-        "title": "Поскаржитися на кімнату"
+        "description": "Поскаржитися на цю кімнату постачальнику облікового запису. Якщо повідомлення зашифровані, адміністратор не зможе прочитати їх.",
+        "reason_label": "Опишіть причину"
     },
     "restore_key_backup_dialog": {
         "count_of_decryption_failures": "Не вдалося розшифрувати %(failedCount)s сеансів!",
@@ -2015,7 +1992,6 @@
             "you_created": "Ви створили кімнату."
         },
         "invite_email_mismatch_suggestion": "Поширте цю адресу е-пошти у налаштуваннях, щоб отримувати запрошення безпосередньо в %(brand)s.",
-        "invite_reject_ignore": "Відхилити й нехтувати користувачем",
         "invite_sent_to_email": "Це запрошення було надіслано на %(email)s",
         "invite_sent_to_email_room": "Це запрошення до %(roomName)s було надіслане на %(email)s",
         "invite_subtitle": "Запрошено <userName/>",
@@ -2112,6 +2088,7 @@
             },
             "uploading_single_file": "Вивантаження %(filename)s"
         },
+        "video_room": "Ця кімната є відеокімнатою",
         "waiting_for_join_subtitle": "Після того, як запрошені користувачі приєднаються до %(brand)s, ви зможете спілкуватися в бесіді, а кімната буде наскрізно зашифрована",
         "waiting_for_join_title": "Очікування приєднання користувача до %(brand)s"
     },
@@ -2168,15 +2145,21 @@
             "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": "Домівка простору",
@@ -2542,6 +2525,7 @@
                 "breadcrumb_third_description": "Вам потрібно буде верифікувати всі наявні пристрої та контакти ще раз",
                 "breadcrumb_title": "Ви впевнені, що хочете скинути свою особистість?",
                 "breadcrumb_title_forgot": "Забули ключ відновлення? Вам потрібно скинути свою особистість.",
+                "breadcrumb_title_sync_failed": "Не вдалося синхронізувати сховище ключів. Вам потрібно скинути свою ідентичність.",
                 "breadcrumb_warning": "Робіть це, лише якщо ви впевнені, що ваш обліковий запис скомпрометований.",
                 "details_title": "Подробиці шифрування",
                 "do_not_close_warning": "Не закривайте це вікно, поки не завершиться скидання",
@@ -2641,6 +2625,7 @@
             "discovery_needs_terms_title": "Дайте змогу людям знаходити вас",
             "display_name": "Показуване ім'я",
             "display_name_error": "Не вдалося встановити показуване ім'я",
+            "email_adding_unsupported_by_hs": "Цей домашній сервер не підтримує додавання адрес електронної пошти до вашого облікового запису.",
             "email_address_in_use": "Ця е-пошта вже використовується",
             "email_address_label": "Адреса е-пошти",
             "email_not_verified": "Ваша адреса е-пошти ще не підтверджена",
@@ -2665,7 +2650,9 @@
             "error_share_msisdn_discovery": "Не вдалося надіслати телефонний номер",
             "identity_server_no_token": "Токен доступу до ідентифікації не знайдено",
             "identity_server_not_set": "Сервер ідентифікації не налаштовано",
+            "invalid_phone_number": "Вказано недійсний номер телефону.",
             "language_section": "Мова",
+            "msisdn_adding_unsupported_by_hs": "Цей домашній сервер не підтримує додавання телефонних номерів до вашого облікового запису.",
             "msisdn_in_use": "Цей телефонний номер вже використовується",
             "msisdn_label": "Телефонний номер",
             "msisdn_verification_field_label": "Код перевірки",
@@ -2684,12 +2671,10 @@
             "unable_to_load_msisdns": "Не вдалося завантажити номери телефонів",
             "username": "Ім'я користувача"
         },
-        "image_thumbnails": "Показувати попередній перегляд зображень",
         "inline_url_previews_default": "Увімкнути вбудований перегляд гіперпосилань за умовчанням",
         "inline_url_previews_room": "Увімкнути попередній перегляд гіперпосилань за умовчанням для учасників цієї кімнати",
         "inline_url_previews_room_account": "Увімкнути попередній перегляд гіперпосилань в цій кімнаті (стосується тільки вас)",
         "insert_trailing_colon_mentions": "Додавати двокрапку після згадки користувача на початку повідомлення",
-        "invite_avatars": "Показувати аватари кімнат, до яких вас запросили",
         "jump_to_bottom_on_send": "Переходити вниз стрічки під час надсилання повідомлення",
         "key_backup": {
             "backup_in_progress": "Створюється резервна копія ваших ключів (перше копіювання може тривати кілька хвилин).",
@@ -2748,6 +2733,14 @@
         "labs_mjolnir": {
             "dialog_title": "<strong>Налаштування:</strong> Ігноровані користувачі"
         },
+        "media_preview": {
+            "hide_avatars": "Сховати аватари кімнати та запрошувача",
+            "hide_media": "Завжди ховати",
+            "media_preview_description": "Сховане медіа завжди можна переглянути, натиснувши на нього",
+            "media_preview_label": "Показувати медіа у стрічці",
+            "show_in_private": "У приватних кімнатах",
+            "show_media": "Завжди показувати"
+        },
         "notifications": {
             "default_setting_description": "Цей параметр буде застосовано усталеним до всіх ваших кімнат.",
             "default_setting_section": "Я хочу отримувати сповіщення про (типове налаштування)",
@@ -2833,57 +2826,20 @@
         "prompt_invite": "Запитувати перед надсиланням запрошень на потенційно недійсні matrix ID",
         "replace_plain_emoji": "Автоматично замінювати простотекстові емодзі",
         "security": {
-            "4s_public_key_in_account_data": "у даних облікового запису",
-            "4s_public_key_status": "Таємне сховище відкритого ключа:",
             "analytics_description": "Поділіться анонімними даними, щоб допомагати нам виявляти проблеми. Нічого особистого. Ніяких третіх осіб.",
-            "backup_key_cached_status": "Резервну копію ключа кешовано:",
-            "backup_key_stored_status": "Резервну копію ключа розміщено:",
-            "backup_key_unexpected_type": "несподіваний тип",
-            "backup_key_well_formed": "добре сформований",
-            "backup_keys_description": "Створіть резервну копію ключів шифрування з даними облікового запису на випадок, якщо ви втратите доступ до своїх сеансів. Ваші ключі будуть захищені унікальним ключем відновлення.",
             "bulk_options_accept_all_invites": "Прийняти всі %(invitedRooms)s запрошення",
             "bulk_options_reject_all_invites": "Відхилити запрошення до усіх %(invitedRooms)s",
             "bulk_options_section": "Масові дії",
-            "cross_signing_cached": "кешовано локально",
-            "cross_signing_homeserver_support": "Підтримка функції домашнім сервером:",
-            "cross_signing_homeserver_support_exists": "існує",
-            "cross_signing_in_4s": "у таємному сховищі",
-            "cross_signing_in_memory": "у пам'яті",
-            "cross_signing_master_private_Key": "Головний приватний ключ:",
-            "cross_signing_not_cached": "не знайдено локально",
-            "cross_signing_not_found": "не знайдено",
-            "cross_signing_not_in_4s": "не знайдено у сховищі",
-            "cross_signing_not_stored": "не збережено",
-            "cross_signing_private_keys": "Приватні ключі перехресного підписування:",
-            "cross_signing_public_keys": "Відкриті ключі перехресного підписування:",
-            "cross_signing_self_signing_private_key": "Самопідписаний приватний ключ:",
-            "cross_signing_user_signing_private_key": "Приватний ключ підпису користувача:",
-            "cryptography_section": "Криптографія",
             "dehydrated_device_description": "Функція офлайн-пристрою дозволяє отримувати зашифровані повідомлення, навіть якщо ви не ввійшли в обліковий запис на жодному пристрої",
             "dehydrated_device_enabled": "Офлайн-пристрій увімкнено",
-            "delete_backup": "Видалити резервну копію",
-            "delete_backup_confirm_description": "Ви впевнені? Ви втратите ваші зашифровані повідомлення якщо копія ключів не була створена коректно.",
             "dialog_title": "<strong>Налаштування:</strong> Безпека й приватність",
             "e2ee_default_disabled_warning": "Адміністратором вашого сервера було вимкнено автоматичне наскрізне шифрування у приватних кімнатах і особистих повідомленнях.",
             "enable_message_search": "Увімкнути шукання повідомлень у зашифрованих кімнатах",
             "encryption_section": "Шифрування",
-            "error_loading_key_backup_status": "Не вдалося завантажити стан резервного копіювання ключа",
-            "export_megolm_keys": "Експортувати ключі наскрізного шифрування кімнат",
             "ignore_users_empty": "Ви не маєте нехтуваних користувачів.",
             "ignore_users_section": "Нехтувані користувачі",
-            "import_megolm_keys": "Імпортувати ключі кімнат наскрізного шифрування",
-            "key_backup_active": "Під час цього сеансу створюється резервна копія ваших ключів.",
-            "key_backup_active_version": "Активна версія резервної копії:",
-            "key_backup_active_version_none": "Вимкнено",
             "key_backup_algorithm": "Алгоритм:",
-            "key_backup_can_be_restored": "Ця резервна копія може бути відновлена в цьому сеансі",
-            "key_backup_complete": "Усі ключі збережено",
             "key_backup_connect": "Налаштувати цьому сеансу резервне копіювання ключів",
-            "key_backup_connect_prompt": "Налаштуйте цьому сеансу резервне копіювання, інакше при виході втратите ключі, доступні лише в цьому сеансі.",
-            "key_backup_in_progress": "Резервне копіювання %(sessionsRemaining)s ключів…",
-            "key_backup_inactive": "Цей сеанс <b>не створює резервну копію ваших ключів</b>, але у вас є резервна копія, з якої ви можете їх відновити.",
-            "key_backup_inactive_warning": "<b>Резервна копія ваших ключів не створюється з цього сеансу</b>.",
-            "key_backup_latest_version": "Остання версія резервної копії на сервері:",
             "message_search_disable_warning": "Якщо вимкнути, пошук не показуватиме повідомлень зашифрованих кімнат.",
             "message_search_disabled": "Безпечно локально кешувати зашифровані повідомлення щоб вони з'являлись у результатах пошуку.",
             "message_search_enabled": {
@@ -2903,13 +2859,7 @@
             "message_search_unsupported": "%(brand)s'ові бракує деяких складників, необхідних для безпечного локального кешування зашифрованих повідомлень. Якщо ви хочете поекспериментувати з цією властивістю, зберіть спеціальну збірку %(brand)s Desktop із <nativeLink>доданням пошукових складників</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s не може безпечно локально кешувати зашифровані повідомлення під час роботи у браузері. Користуйтесь <desktopLink>%(brand)s для комп'ютерів</desktopLink>, в якому зашифровані повідомлення з'являються у результатах пошуку.",
             "record_session_details": "Записуйте назву клієнта, версію та URL-адресу, щоб легше розпізнавати сеанси в менеджері сеансів",
-            "restore_key_backup": "Відновити з резервної копії",
-            "secret_storage_not_ready": "не готове",
-            "secret_storage_ready": "готове",
-            "secret_storage_status": "Таємне сховище:",
             "send_analytics": "Надсилати дані аналітики",
-            "session_id": "ID сеансу:",
-            "session_key": "Ключ сеансу:",
             "strict_encryption": "Надсилати повідомлення лише верифікованим користувачам"
         },
         "send_read_receipts": "Надсилати підтвердження прочитання",
@@ -3152,8 +3102,6 @@
         "topic": "Показує чи встановлює тему кімнати",
         "topic_none": "Ця кімната не має теми.",
         "topic_room_error": "Не вдалося отримати тему кімнати: не вдалося знайти кімнату (%(roomId)s",
-        "tovirtual": "Переходить до віртуальної кімнати, якщо ваша кімната її має",
-        "tovirtual_not_found": "Ця кімната не має віртуальної кімнати",
         "unban": "Розблоковує користувача з указаним ID",
         "unflip": "Додає ┬──┬ ノ( ゜-゜ノ) на початку текстового повідомлення",
         "unholdcall": "Знімає виклик у поточній кімнаті з утримання",
@@ -3276,7 +3224,7 @@
         "heading_without_query": "Пошук",
         "join_button_text": "Приєднатися до %(roomAddress)s",
         "keyboard_scroll_hint": "Використовуйте <arrows/>, щоб прокручувати",
-        "message_search_section_title": "Інші пошуки",
+        "messages_label": "Повідомлення",
         "other_rooms_in_space": "Інші кімнати в %(spaceName)s",
         "public_rooms_label": "Загальнодоступні кімнати",
         "public_spaces_label": "Загальнодоступні простори",
@@ -3286,7 +3234,6 @@
         "result_may_be_hidden_privacy_warning": "Деякі результати можуть бути приховані через приватність",
         "result_may_be_hidden_warning": "Деякі результати можуть бути приховані",
         "search_dialog": "Вікно пошуку",
-        "search_messages_hint": "Шукайте повідомлення за допомогою піктограми <icon/> вгорі кімнати",
         "spaces_title": "Ваші простори",
         "start_group_chat_button": "Розпочати нову бесіду"
     },
@@ -3335,9 +3282,7 @@
     "threads_activity_centre": {
         "header": "Діяльність у гілках",
         "no_rooms_with_threads_notifs": "У вас ще немає кімнат зі сповіщеннями в гілках.",
-        "no_rooms_with_unread_threads": "У вас ще немає кімнат з непрочитаними гілками.",
-        "release_announcement_description": "Сповіщення гілок переміщено, відтепер вони тут.",
-        "release_announcement_header": "Центр діяльності в гілках"
+        "no_rooms_with_unread_threads": "У вас ще немає кімнат з непрочитаними гілками."
     },
     "time": {
         "about_day_ago": "близько доби тому",
@@ -3848,10 +3793,11 @@
         "unavailable": "Недоступний"
     },
     "update_room_access_modal": {
-        "description": "Щоб створити посилання для спільного доступу, потрібно дозволити гостям приєднуватися до цієї кімнати. Рівень безпеки кімнати стане нижчим. Після завершення виклику, ви можете знову зробити кімнату приватною.",
-        "dont_change_description": "Як варіант, ви можете провести виклик в окремій кімнаті.",
+        "description": "Щоб створити посилання для поширення, зробіть кімнату <b>загальнодоступною</b> або дозвольте користувачам надсилати <b>запит приєднатися</b>. Це дозволить гостям приєднуватися без запрошення.",
+        "dont_change_description": "Якщо ви не хочете змінювати доступ до цієї кімнати, ви можете створити нову кімнату для посилання на виклик.",
         "no_change": "Я не хочу змінювати рівень доступу.",
-        "title": "Змінити рівень доступу до кімнати"
+        "revert_access_description": "(Це значення можна повернути до попереднього в налаштуваннях кімнати: <b>Безпека та приватність</b> /<b> Доступ</b>)",
+        "title": "Дозволити гостьовим користувачам приєднуватися до цієї кімнати"
     },
     "upload_failed_generic": "Не вдалося вивантажити файл '%(fileName)s'.",
     "upload_failed_size": "Файл '%(fileName)s' перевищує ліміт розміру для відвантажень домашнього сервера",
@@ -4198,8 +4144,8 @@
             "sequences": "Послідовності типу abc або 6543 легко вгадувані",
             "similarToCommon": "Це занадто простий пароль",
             "simpleRepeat": "Повтори типу \"ааа\" легко вгадувані",
-            "straightRow": "Прямі ради клавіш легко вгадувані",
-            "topHundred": "Це топ-100 легких та розповсюджених паролів",
+            "straightRow": "Прямі ряди клавіш легко вгадувані",
+            "topHundred": "Це 100 найлегших та найпоширеніших паролів",
             "topTen": "Це топ-10 легких та звичайних паролів",
             "userInputs": "Не повинно бути жодних особистих даних або даних, пов'язаних зі сторінкою.",
             "wordByItself": "Загальновживані слова легко вгадувані"
diff --git a/src/i18n/strings/vi.json b/src/i18n/strings/vi.json
index 875ec0f1ca..a0c91663ff 100644
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -79,6 +79,7 @@
         "new_video_room": "Tạo phòng truyền hình",
         "next": "Tiếp",
         "no": "Không",
+        "ok": "Ok",
         "open": "Mở",
         "pause": "Tạm dừng",
         "pin": "Ghim",
@@ -88,7 +89,6 @@
         "react": "Phản ứng",
         "refresh": "Làm tươi",
         "register": "Đăng ký",
-        "reject": "Từ chối",
         "reload": "Tải lại",
         "remove": "Xoá",
         "rename": "Đặt lại tên",
@@ -369,6 +369,7 @@
     },
     "common": {
         "access_token": "Token truy cập",
+        "accessibility": "Trợ năng",
         "advanced": "Nâng cao",
         "analytics": "Về dữ liệu phân tích",
         "and_n_others": {
@@ -385,7 +386,6 @@
         "cameras": "Máy quay",
         "copied": "Đã sao chép!",
         "credits": "Ghi công",
-        "cross_signing": "Xác thực chéo",
         "dark": "Tối",
         "description": "Sự mô tả",
         "deselect_all": "Bỏ chọn tất cả",
@@ -516,6 +516,8 @@
         "edit_composer_label": "Chỉnh sửa tin nhắn",
         "format_bold": "In đậm",
         "format_code_block": "Khối mã",
+        "format_decrease_indent": "Giảm thụt lề",
+        "format_increase_indent": "Tăng thụt lề",
         "format_inline_code": "Mã",
         "format_insert_link": "Chèn liên kết",
         "format_italic": "Nghiêng",
@@ -625,7 +627,9 @@
         "subspace_join_rule_restricted_description": "Bất kỳ ai trong <SpaceName/> đều có thể tìm và tham gia."
     },
     "credits": {
-        "default_cover_photo": "Các <photo>ảnh bìa mặc định</photo> Là © <author>Chúa Jesus Roncero</author> Được sử dụng theo các điều khoản của <terms>CC-BY-SA 4.0</terms>."
+        "default_cover_photo": "Các <photo>ảnh bìa mặc định</photo> Là © <author>Chúa Jesus Roncero</author> Được sử dụng theo các điều khoản của <terms>CC-BY-SA 4.0</terms>.",
+        "twemoji": "Bộ <twemoji>Twemoji</twemoji> được © <author>Twitter, Inc and other contributors</author> sử dụng dưới các điều khoản trong giấy phép <terms>CC-BY 4.0</terms>.",
+        "twemoji_colr": "<colr>twemoji-colr</colr> được Quỹ ©<author>Mozilla Foundation</author> sử dụng dựa trên các điều khoản trong giấy phép <terms>Apache 2.0</terms>."
     },
     "desktop_default_device_name": "%(brand)s máy tính: %(platformName)s",
     "devtools": {
@@ -712,44 +716,23 @@
     "empty_room_was_name": "Phòng trống (trước kia là %(oldName)s)",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "Nhập Chuỗi bảo mật hoặc <button>sử dụng Khóa bảo mật</button> của bạn để tiếp tục.",
             "key_validation_text": {
-                "invalid_security_key": "Khóa bảo mật không hợp lệ",
-                "recovery_key_is_correct": "Có vẻ tốt!",
-                "wrong_file_type": "Loại tệp sai",
                 "wrong_security_key": "Khóa bảo mật sai"
             },
-            "reset_title": "Đặt lại mọi thứ",
-            "reset_warning_1": "Chỉ thực hiện việc này nếu bạn không có thiết bị nào khác để hoàn tất quá trình xác thực.",
-            "reset_warning_2": "Nếu bạn đặt lại mọi thứ, bạn sẽ khởi động lại mà không có phiên nào đáng tin cậy, không có người dùng đáng tin cậy và có thể không xem được các tin nhắn trước đây.",
             "restoring": "Khôi phục khóa từ sao lưu",
-            "security_key_title": "Chìa khóa bảo mật",
-            "security_phrase_incorrect_error": "Không thể truy cập bộ nhớ bí mật. Vui lòng xác minh rằng bạn đã nhập đúng Cụm từ bảo mật.",
-            "security_phrase_title": "Cụm từ Bảo mật",
-            "separator": "%(securityKey)s hay %(recoveryFile)s",
-            "use_security_key_prompt": "Sử dụng Khóa bảo mật của bạn để tiếp tục."
+            "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_not_ready": "Tính năng xác thực chéo chưa được thiết lập.",
-        "cross_signing_ready": "Xác thực chéo đã sẵn sàng để sử dụng.",
-        "cross_signing_ready_no_backup": "Xác thực chéo đã sẵn sàng nhưng các khóa chưa được sao lưu.",
         "cross_signing_room_normal": "Phòng này được mã hóa end-to-end",
         "cross_signing_room_verified": "Mọi người trong phòng này đã được xác thực",
         "cross_signing_room_warning": "Ai đó đang sử dụng một phiên không xác định",
-        "cross_signing_unsupported": "Máy chủ của bạn không hỗ trợ xác thực chéo.",
-        "cross_signing_untrusted": "Tài khoản của bạn có danh tính xác thực chéo trong vùng lưu trữ bí mật, nhưng chưa được phiên này tin cậy.",
         "cross_signing_user_normal": "Bạn chưa xác thực người dùng này.",
         "cross_signing_user_verified": "Bạn đã xác thực người dùng này. Người dùng này đã xác thực tất cả các phiên của họ.",
         "cross_signing_user_warning": "Người dùng này chưa xác thực tất cả các phiên của họ.",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "Xóa các khóa ký chéo",
-            "title": "Hủy khóa xác thực chéo?",
-            "warning": "Xóa khóa ký chéo là vĩnh viễn. Bất kỳ ai mà bạn đã xác thực đều sẽ thấy cảnh báo bảo mật. Bạn gần như chắc chắn không muốn làm điều này, trừ khi bạn bị mất mọi thiết bị mà bạn có thể đăng nhập chéo."
-        },
         "event_shield_reason_authenticity_not_guaranteed": "Tính xác thực của tin nhắn được mã hóa này không thể được đảm bảo trên thiết bị này.",
         "event_shield_reason_mismatched_sender_key": "Được mã hóa bởi một phiên chưa được xác thực",
         "export_unsupported": "Trình duyệt của bạn không hỗ trợ chức năng mã hóa",
@@ -769,7 +752,6 @@
             "title": "Phương pháp Khôi phục mới",
             "warning": "Nếu bạn không đặt phương pháp khôi phục mới, 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."
         },
-        "not_supported": "<không được hỗ trợ>",
         "recovery_method_removed": {
             "description_1": "Phiên này đã phát hiện rằng Cụm từ bảo mật và khóa cho Tin nhắn an toàn của bạn đã bị xóa.",
             "description_2": "Nếu bạn vô tình làm điều này, bạn có thể Cài đặt Tin nhắn được bảo toàn trên phiên này. Tính năng này sẽ mã hóa lại lịch sử tin nhắn của phiên này bằng một phương pháp khôi phục mới.",
@@ -780,8 +762,7 @@
         "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.",
-            "title": "Cài đặt"
+            "explainer": "Sao lưu chìa khóa của bạn trước khi đăng xuất để tránh mất chúng."
         },
         "udd": {
             "interactive_verification_button": "Xác thực có tương tác bằng biểu tượng cảm xúc",
@@ -796,7 +777,6 @@
             "accepting": "Đang chấp nhận…",
             "after_new_login": {
                 "device_verified": "Thiết bị được xác thực",
-                "reset_confirmation": "Thực sự đặt lại các khóa xác minh?",
                 "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"
@@ -866,8 +846,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_reset_warning_1": "Sẽ không thể hoàn tác lại việc đặt lại các khóa xác thực của bạn. Sau khi đặt lại, bạn sẽ không có quyền truy cập vào các tin nhắn đã được mã hóa cũ, và bạn bè đã được xác thực trước đó bạn sẽ thấy các cảnh báo bảo mật cho đến khi bạn xác thực lại với họ.",
-            "verify_reset_warning_2": "Chỉ tiếp tục nếu bạn chắc chắn là mình đã mất mọi thiết bị khác và khóa bảo mật.",
             "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",
@@ -926,11 +904,7 @@
             "title": "Không thể sao chép liên kết phòng"
         },
         "error_loading_user_profile": "Không thể tải hồ sơ người dùng",
-        "forget_room_failed": "Không thể quên phòng %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "Máy chủ có thể không khả dụng, quá tải hoặc hết thời gian tìm kiếm :(",
-            "title": "Tìm kiếm không thành công"
-        }
+        "forget_room_failed": "Không thể quên phòng %(errCode)s"
     },
     "error_user_not_logged_in": "Người dùng đang không đăng nhập",
     "event_preview": {
@@ -990,6 +964,7 @@
         "generating_zip": "Tạo ZIP",
         "html_title": "Dữ liệu được trích xuất",
         "include_attachments": "Bao gồm các đính kèm",
+        "json": "JSON",
         "media_omitted": "Phương tiện bị bỏ qua",
         "media_omitted_file_size": "Phương tiện bị bỏ qua - kích thước tệp vượt quá giới hạn",
         "messages": "Tin nhắn",
@@ -1154,6 +1129,7 @@
     },
     "keyboard": {
         "activate_button": "Kích hoạt nút đã chọn",
+        "alt": "Alt",
         "autocomplete_cancel": "Hủy tự động hoàn thành",
         "backspace": "Phím lùi",
         "cancel_reply": "Hủy trả lời tin nhắn",
@@ -1174,6 +1150,7 @@
         "composer_toggle_link": "Chuyển đổi liên kết",
         "composer_toggle_quote": "Chuyển sang Trích dẫn",
         "composer_undo": "Hoàn tác chỉnh sửa",
+        "control": "Phím Ctrl",
         "dismiss_read_marker_and_jump_bottom": "Bỏ qua điểm đánh dấu đã đọc và chuyển xuống cuối",
         "end": "Kết thúc",
         "enter": "Vào",
@@ -1195,6 +1172,7 @@
         "scroll_up_timeline": "Cuộn lên trong dòng thời gian",
         "search": "Tìm kiếm (phải được bật)",
         "send_sticker": "Gửi nhãn dán",
+        "shift": "Phím Shift",
         "space": "space",
         "toggle_microphone_mute": "Chuyển đổi chế độ tắt tiếng micrô",
         "toggle_right_panel": "Chuyển đổi bảng điều khiển bên phải",
@@ -1468,11 +1446,6 @@
         "ongoing": "Đang xóa…",
         "reason_label": "Lý do (không bắt buộc)"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "Bạn có chắc chắn muốn từ chối lời mời không?",
-        "failed": "Không thể từ chối lời mời",
-        "title": "Từ chối lời mời"
-    },
     "report_content": {
         "description": "Báo cáo thông báo này sẽ gửi 'ID sự kiện' duy nhất của nó đến quản trị viên của máy chủ của bạn. Nếu tin nhắn trong phòng này được mã hóa, quản trị viên máy chủ của bạn sẽ không thể đọc nội dung tin nhắn hoặc xem bất kỳ tệp hoặc hình ảnh nào.",
         "disagree": "Không đồng ý",
@@ -1615,7 +1588,6 @@
             "you_created": "Bạn đã tạo phòng này."
         },
         "invite_email_mismatch_suggestion": "Chia sẻ địa chỉ thư điện tử này trong Cài đặt để nhận lời mời trực tiếp trong %(brand)s.",
-        "invite_reject_ignore": "Từ chối & Bỏ qua người dùng",
         "invite_sent_to_email": "Lời mời này đã được gửi tới %(email)s",
         "invite_sent_to_email_room": "Lời mời đến %(roomName)s này đã được gửi tới %(email)s",
         "invite_subtitle": "<userName/> đã mời bạn",
@@ -2101,7 +2073,6 @@
             "remove_msisdn_prompt": "Xóa %(phone)s?",
             "spell_check_locale_placeholder": "Chọn vùng miền"
         },
-        "image_thumbnails": "Hiển thị bản xem trước / hình thu nhỏ cho hình ảnh",
         "inline_url_previews_default": "Bật xem trước nội dung liên kết theo mặc định",
         "inline_url_previews_room": "Bật xem trước nội dung liên kết cho mọi người trong phòng này",
         "inline_url_previews_room_account": "Bật xem trước nội dung liên kết trong phòng này (chỉ với bạn)",
@@ -2213,50 +2184,16 @@
         "prompt_invite": "Nhắc trước khi gửi lời mời đến các ID Matrix có khả năng không hợp lệ",
         "replace_plain_emoji": "Tự động thay thế hình biểu tượng",
         "security": {
-            "4s_public_key_in_account_data": "trong dữ liệu tài khoản",
-            "4s_public_key_status": "Khóa công khai lưu trữ bí mật:",
-            "backup_key_cached_status": "Đệm các khóa được sao lưu:",
-            "backup_key_stored_status": "Lưu trữ hóa được sao lưu:",
-            "backup_key_unexpected_type": "loại bất ngờ",
-            "backup_key_well_formed": "được hình thành một cách hoàn hảo",
-            "backup_keys_description": "Sao lưu các khóa mã hóa với dữ liệu tài khoản của bạn trong trường hợp bạn mất quyền truy cập vào các phiên của mình. Các khóa của bạn sẽ được bảo mật bằng Khóa bảo mật duy nhất.",
             "bulk_options_accept_all_invites": "Chấp nhận tất cả các lời mời từ %(invitedRooms)s",
             "bulk_options_reject_all_invites": "Từ chối tất cả lời mời từ %(invitedRooms)s",
             "bulk_options_section": "Tùy chọn hàng loạt",
-            "cross_signing_cached": "được lưu trữ cục bộ",
-            "cross_signing_homeserver_support": "Tính năng được hỗ trợ bởi máy chủ:",
-            "cross_signing_homeserver_support_exists": "tồn tại",
-            "cross_signing_in_4s": "trong vùng lưu trữ bí mật",
-            "cross_signing_in_memory": "trong bộ nhớ",
-            "cross_signing_master_private_Key": "Khóa cá nhân chính:",
-            "cross_signing_not_cached": "không tìm thấy ở địa phương",
-            "cross_signing_not_found": "không tìm thấy",
-            "cross_signing_not_in_4s": "không tìm thấy trong bộ nhớ",
-            "cross_signing_not_stored": "không được lưu trữ",
-            "cross_signing_private_keys": "Khóa cá nhân xác thực chéo:",
-            "cross_signing_public_keys": "Khóa công khai xác thực chéo:",
-            "cross_signing_self_signing_private_key": "Khóa cá nhân tự ký:",
-            "cross_signing_user_signing_private_key": "Người dùng ký khóa cá nhân:",
-            "cryptography_section": "Mã hóa bảo mật",
-            "delete_backup": "Xóa Sao lưu",
-            "delete_backup_confirm_description": "Bạn có chắc không? Bạn sẽ mất các tin nhắn được mã hóa nếu các khóa của bạn không được sao lưu đúng cách.",
             "e2ee_default_disabled_warning": "Người quản trị máy chủ của bạn đã vô hiệu hóa mã hóa đầu cuối theo mặc định trong phòng riêng và Tin nhắn trực tiếp.",
             "enable_message_search": "Bật tính năng tìm kiếm tin nhắn trong các phòng được mã hóa",
             "encryption_section": "Mã hóa",
-            "error_loading_key_backup_status": "Không thể tải trạng thái sao lưu khóa",
-            "export_megolm_keys": "Xuất các mã khoá phòng E2E",
             "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",
-            "import_megolm_keys": "Nhập các mã khoá phòng E2E",
-            "key_backup_active": "Phiên này đang sao lưu các khóa.",
-            "key_backup_active_version_none": "Không có",
             "key_backup_algorithm": "Thuật toán:",
-            "key_backup_complete": "Tất cả các khóa được sao lưu",
             "key_backup_connect": "Kết nối phiên này với Khóa Sao lưu",
-            "key_backup_connect_prompt": "Kết nối phiên này với máy chủ sao lưu khóa trước khi đăng xuất để tránh mất bất kỳ khóa nào có thể chỉ có trong phiên này.",
-            "key_backup_in_progress": "Đang sao lưu %(sessionsRemaining)s khóa…",
-            "key_backup_inactive": "Phiên này đang <b>không sao lưu các khóa</b>, nhưng bạn có một bản sao lưu hiện có, bạn có thể khôi phục và thêm vào để về sau.",
-            "key_backup_inactive_warning": "Các khóa của bạn <b>not being backed up from this session</b>.",
             "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": {
@@ -2276,13 +2213,7 @@
             "message_search_unsupported": "%(brand)s thiếu một số thành phần thiết yếu để lưu trữ cục bộ an toàn các tin nhắn được mã hóa. Nếu bạn muốn thử nghiệm với tính năng này, hãy dựng một bản %(brand)s tùy chỉnh cho máy tính có thêm <nativeLink>các thành phần để tìm kiếm</nativeLink>.",
             "message_search_unsupported_web": "%(brand)s không thể lưu trữ cục bộ an toàn các tin nhắn được mã hóa khi đang chạy trong trình duyệt web. Sử dụng <desktopLink>%(brand)s cho máy tính</desktopLink> để các tin nhắn được mã hóa xuất hiện trong kết quả tìm kiếm.",
             "record_session_details": "Ghi lại tên phần mềm máy khách, phiên bản, và đường dẫn để nhận diện các phiên dễ dàng hơn trong trình quản lý phiên",
-            "restore_key_backup": "Khôi phục từ Sao lưu",
-            "secret_storage_not_ready": "chưa sẵn sàng",
-            "secret_storage_ready": "Sẵn sàng",
-            "secret_storage_status": "Lưu trữ bí mật:",
             "send_analytics": "Gửi dữ liệu phân tích",
-            "session_id": "Định danh (ID) phiên:",
-            "session_key": "Khóa phiên:",
             "strict_encryption": "Không bao giờ gửi tin nhắn được mã hóa đến các phiên chưa được xác thực từ phiên này"
         },
         "send_read_receipts": "Gửi thông báo đã đọc",
@@ -2504,8 +2435,6 @@
         "topic": "Lấy hoặc đặt chủ đề phòng",
         "topic_none": "Phòng này chưa có chủ đề.",
         "topic_room_error": "Không thể lấy chủ đề phòng: Không tìm thấy phòng (%(roomId)s)",
-        "tovirtual": "Chuyển sang phòng ảo của phòng này, nếu nó có",
-        "tovirtual_not_found": "Không có phòng ảo của phòng này",
         "unban": "Gỡ cấm thành viên có ID chỉ định",
         "unflip": "Thêm ┬──┬ ノ( ゜-゜ノ) vào tin nhắn văn bản thuần túy",
         "unholdcall": "Nối lại cuộc gọi trong phòng hiện tại",
@@ -2620,14 +2549,12 @@
         "heading_without_query": "Tìm",
         "join_button_text": "Tham gia %(roomAddress)s",
         "keyboard_scroll_hint": "Dùng <arrows/> để cuộn",
-        "message_search_section_title": "Các tìm kiếm khác",
         "other_rooms_in_space": "Các phòng khác trong %(spaceName)s",
         "public_rooms_label": "Các phòng công cộng",
         "recent_searches_section_title": "Các tìm kiếm gần đây",
         "recently_viewed_section_title": "Được xem gần đây",
         "result_may_be_hidden_privacy_warning": "Một số kết quả có thể bị ẩn để đảm bảo quyền riêng tư",
         "result_may_be_hidden_warning": "Một số kết quả có thể bị ẩn",
-        "search_messages_hint": "Để tìm các tin nhắn, hãy tìm biểu tượng này ở đầu phòng <icon/>",
         "spaces_title": "Các Space bạn đang trong đó",
         "start_group_chat_button": "Bắt đầu cuộc trò chuyện nhóm"
     },
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 70fd454fc7..43e1ac008c 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -89,7 +89,6 @@
         "react": "回应",
         "refresh": "刷新",
         "register": "注册",
-        "reject": "拒绝",
         "reload": "重加载",
         "remove": "移除",
         "rename": "重命名",
@@ -405,7 +404,6 @@
         "capabilities": "功能",
         "copied": "已复制！",
         "credits": "感谢",
-        "cross_signing": "交叉签名",
         "dark": "深色",
         "description": "描述",
         "deselect_all": "取消全选",
@@ -728,44 +726,23 @@
     "empty_room_was_name": "空房间（曾是%(oldName)s）",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "输入安全短语或<button>使用安全密钥</button>以继续。",
             "key_validation_text": {
-                "invalid_security_key": "安全密钥无效",
-                "recovery_key_is_correct": "看着不错！",
-                "wrong_file_type": "错误文件类型",
                 "wrong_security_key": "安全密钥错误"
             },
-            "reset_title": "全部重置",
-            "reset_warning_1": "当你没有其他设备可以用于完成验证时，方可执行此操作。",
-            "reset_warning_2": "如果你全部重置，你将会在没有受信任的会话重新开始、没有受信任的用户，且可能会看不到过去的消息。",
             "restoring": "从备份恢复密钥",
-            "security_key_title": "安全密钥",
-            "security_phrase_incorrect_error": "无法访问秘密存储。请确认你输入了正确的安全短语。",
-            "security_phrase_title": "安全短语",
-            "separator": "%(securityKey)s或%(recoveryFile)s",
-            "use_security_key_prompt": "使用你的安全密钥以继续。"
+            "security_key_title": "安全密钥"
         },
         "bootstrap_title": "设置密钥",
         "cancel_entering_passphrase_description": "你确定要取消输入口令词组吗？",
         "cancel_entering_passphrase_title": "取消输入口令词组？",
         "confirm_encryption_setup_body": "点击下方按钮以确认设置加密。",
         "confirm_encryption_setup_title": "确认加密设置",
-        "cross_signing_not_ready": "未设置交叉签名。",
-        "cross_signing_ready": "交叉签名已可用。",
-        "cross_signing_ready_no_backup": "交叉签名已就绪，但尚未备份密钥。",
         "cross_signing_room_normal": "此房间是端到端加密的",
         "cross_signing_room_verified": "房间中所有人都已被验证",
         "cross_signing_room_warning": "有人在使用未知会话",
-        "cross_signing_unsupported": "你的家服务器不支持交叉签名。",
-        "cross_signing_untrusted": "你的账户在秘密存储中有交叉签名身份，但并没有被此会话信任。",
         "cross_signing_user_normal": "你没有验证此用户。",
         "cross_signing_user_verified": "你验证了此用户。此用户已验证了其全部会话。",
         "cross_signing_user_warning": "此用户没有验证其全部会话。",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "清楚交叉签名密钥",
-            "title": "销毁交叉签名密钥？",
-            "warning": "删除交叉签名密钥是永久的。所有你验证过的人都会看到安全警报。除非你丢失了所有可以交叉签名的设备，否则几乎可以确定你不想这么做。"
-        },
         "event_shield_reason_authenticity_not_guaranteed": "此加密消息的真实性无法在此设备上保证。",
         "event_shield_reason_mismatched_sender_key": "由未验证的会话加密",
         "export_unsupported": "你的浏览器不支持所需的密码学扩展",
@@ -785,7 +762,6 @@
             "title": "新恢复方式",
             "warning": "如果你没有设置新恢复方式，可能有攻击者正试图侵入你的账户。请立即更改你的账户密码并在设置中设定一个新恢复方式。"
         },
-        "not_supported": "<不支持>",
         "recovery_method_removed": {
             "description_1": "此会话已检测到你的安全短语和安全消息密钥被移除。",
             "description_2": "如果你出于意外这样做了，你可以在此会话上设置安全消息，以使用新的加密方式重新加密此会话的消息历史。",
@@ -796,8 +772,7 @@
         "set_up_toast_description": "防止丢失加密消息和数据的访问权",
         "set_up_toast_title": "设置安全备份",
         "setup_secure_backup": {
-            "explainer": "在登出之前请备份密钥以免丢失。",
-            "title": "设置"
+            "explainer": "在登出之前请备份密钥以免丢失。"
         },
         "udd": {
             "interactive_verification_button": "用表情符号交互式验证",
@@ -812,7 +787,6 @@
             "accepting": "正在接受……",
             "after_new_login": {
                 "device_verified": "设备已验证",
-                "reset_confirmation": "确实要重置验证密钥？",
                 "skip_verification": "暂时跳过验证",
                 "unable_to_verify": "无法验证此设备",
                 "verify_this_device": "验证此设备"
@@ -876,7 +850,6 @@
             "verify_emoji_prompt": "通过比较唯一的表情符号来验证。",
             "verify_emoji_prompt_qr": "如果你不能扫描以上代码，请通过比较唯一的表情符号来验证。",
             "verify_later": "我稍后进行验证",
-            "verify_reset_warning_1": "无法撤消重置验证密钥的操作。重置后，你将无法访问旧的加密消息，任何之前验证过你的朋友将看到安全警告，直到你再次和他们进行验证。",
             "verify_using_device": "使用其他设备进行验证",
             "verify_using_key": "使用安全密钥进行验证",
             "verify_using_key_or_phrase": "使用安全密钥或短语进行验证",
@@ -935,11 +908,7 @@
             "title": "无法复制房间链接"
         },
         "error_loading_user_profile": "无法加载用户资料",
-        "forget_room_failed": "忘记房间失败，错误代码： %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "服务器可能不可用、超载，或者搜索超时 :(",
-            "title": "搜索失败"
-        }
+        "forget_room_failed": "忘记房间失败，错误代码： %(errCode)s"
     },
     "error_user_not_logged_in": "用户未登录",
     "event_preview": {
@@ -1498,11 +1467,6 @@
         "ongoing": "正在移除…",
         "reason_label": "理由（可选）"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "你确定要拒绝邀请吗？",
-        "failed": "拒绝邀请失败",
-        "title": "拒绝邀请"
-    },
     "report_content": {
         "description": "举报此消息会将其唯一的“事件ID”发送给你的家服务器的管理员。如果此房间中的消息是加密的，则你的家服务器管理员将无法阅读消息文本，也无法查看任何文件或图片。",
         "disagree": "不同意",
@@ -1641,7 +1605,6 @@
             "you_created": "你创建了此房间。"
         },
         "invite_email_mismatch_suggestion": "要在 %(brand)s 中直接接收邀请，请在设置中共享此邮箱。",
-        "invite_reject_ignore": "拒绝并忽略用户",
         "invite_sent_to_email": "邀请已被发送到 %(email)s",
         "invite_sent_to_email_room": "这个到 %(roomName)s 的邀请是发送给 %(email)s 的",
         "invite_subtitle": "<userName/> 邀请了你",
@@ -2112,7 +2075,6 @@
             "remove_msisdn_prompt": "删除 %(phone)s 吗？",
             "spell_check_locale_placeholder": "选择区域设置"
         },
-        "image_thumbnails": "显示图片的预览图",
         "inline_url_previews_default": "默认启用行内URL预览",
         "inline_url_previews_room": "对此房间的所有参与者默认启用URL预览",
         "inline_url_previews_room_account": "对此房间启用URL预览（仅影响你）",
@@ -2213,49 +2175,16 @@
         "prompt_invite": "在发送邀请之前提示可能无效的 Matrix ID",
         "replace_plain_emoji": "自动取代纯文本为表情符号",
         "security": {
-            "4s_public_key_in_account_data": "在账户数据中",
-            "4s_public_key_status": "秘密存储公钥：",
-            "backup_key_cached_status": "备份密钥已缓存：",
-            "backup_key_stored_status": "备份密钥已保存：",
-            "backup_key_unexpected_type": "未预期的类型",
-            "backup_key_well_formed": "格式正确",
-            "backup_keys_description": "请使用你的账户数据备份加密密钥，以免你无法访问你的会话。密钥会由一个唯一安全密钥保护。",
             "bulk_options_accept_all_invites": "接受所有 %(invitedRooms)s 邀请",
             "bulk_options_reject_all_invites": "拒绝所有 %(invitedRooms)s 的邀请",
             "bulk_options_section": "批量选择",
-            "cross_signing_cached": "本地缓存",
-            "cross_signing_homeserver_support": "家服务器功能支持：",
-            "cross_signing_homeserver_support_exists": "存在",
-            "cross_signing_in_4s": "在秘密存储中",
-            "cross_signing_in_memory": "在内存中",
-            "cross_signing_master_private_Key": "主私钥：",
-            "cross_signing_not_cached": "本地未找到",
-            "cross_signing_not_found": "未找到",
-            "cross_signing_not_in_4s": "未在存储中找到",
-            "cross_signing_not_stored": "未存储",
-            "cross_signing_private_keys": "交叉签名私钥：",
-            "cross_signing_public_keys": "交叉签名公钥：",
-            "cross_signing_self_signing_private_key": "自签名私钥：",
-            "cross_signing_user_signing_private_key": "用户签名私钥：",
-            "cryptography_section": "加密",
-            "delete_backup": "删除备份",
-            "delete_backup_confirm_description": "你确定吗？如果密钥没有正确地备份你将失去你的加密消息。",
             "e2ee_default_disabled_warning": "你的服务器管理员默认关闭了私人房间和私聊中的端到端加密。",
             "enable_message_search": "在加密房间中启用消息搜索",
             "encryption_section": "加密",
-            "error_loading_key_backup_status": "无法载入密钥备份状态",
-            "export_megolm_keys": "导出房间的端到端加密密钥",
             "ignore_users_empty": "你没有设置忽略用户。",
             "ignore_users_section": "已忽略的用户",
-            "import_megolm_keys": "导入房间端到端加密密钥",
-            "key_backup_active": "此会话正在备份你的密钥。",
-            "key_backup_active_version_none": "无",
             "key_backup_algorithm": "算法：",
-            "key_backup_complete": "所有密钥都已备份",
             "key_backup_connect": "将此会话连接到密钥备份",
-            "key_backup_connect_prompt": "在登出前连接此会话到密钥备份以避免丢失可能仅在此会话上的密钥。",
-            "key_backup_inactive": "此会话<b>未备份你的密钥</b>，但如果你已有现存备份，你可以继续并从中恢复和向其添加。",
-            "key_backup_inactive_warning": "你的密钥<b>没有被此会话备份</b>。",
             "message_search_disable_warning": "如果被禁用，加密房间内的消息不会显示在搜索结果中。",
             "message_search_disabled": "在本地安全地缓存加密消息以使其出现在搜索结果中。",
             "message_search_enabled": {
@@ -2275,13 +2204,7 @@
             "message_search_unsupported": "%(brand)s缺少安全地在本地缓存加密信息所必须的部件。如果你想实验此功能，请构建一个自定义的<nativeLink>带有搜索部件的</nativeLink>%(brand)s桌面版。",
             "message_search_unsupported_web": "%(brand)s 在浏览器中运行时不能安全地在本地缓存加密信息。请使用<desktopLink>%(brand)s 桌面版</desktopLink>以使加密信息出现在搜索结果中。",
             "record_session_details": "记录客户端名称、版本和url以便在会话管理器里更易识别",
-            "restore_key_backup": "从备份恢复",
-            "secret_storage_not_ready": "尚未就绪",
-            "secret_storage_ready": "就绪",
-            "secret_storage_status": "秘密存储：",
             "send_analytics": "发送统计数据",
-            "session_id": "会话 ID：",
-            "session_key": "会话密钥：",
             "strict_encryption": "永不从本会话向未验证的会话发送加密消息"
         },
         "send_read_receipts": "发送已读回执",
@@ -2463,8 +2386,6 @@
         "topic": "获取或设置房间话题",
         "topic_none": "此房间没有话题。",
         "topic_room_error": "获取房间话题失败：无法找到房间（%(roomId)s）",
-        "tovirtual": "切换到此房间的虚拟房间（如有）",
-        "tovirtual_not_found": "此房间未有虚拟房间",
         "unban": "按照 ID 解封用户",
         "unflip": "在纯文本消息开头添加 ┬──┬ ノ( ゜-゜ノ)",
         "unholdcall": "解除挂起当前房间的通话",
@@ -2584,7 +2505,6 @@
         "heading_without_query": "搜索",
         "join_button_text": "加入%(roomAddress)s",
         "keyboard_scroll_hint": "用<arrows/>来滚动",
-        "message_search_section_title": "其他搜索",
         "other_rooms_in_space": "%(spaceName)s 中的其他房间",
         "public_rooms_label": "公共房间",
         "public_spaces_label": "公共空间",
@@ -2594,7 +2514,6 @@
         "result_may_be_hidden_privacy_warning": "为保护隐私，一些结果可能被隐藏",
         "result_may_be_hidden_warning": "一些结果可能被隐藏",
         "search_dialog": "搜索对话",
-        "search_messages_hint": "要搜索消息，请在房间顶部查找此图标<icon/>",
         "spaces_title": "你所在的空间",
         "start_group_chat_button": "发起群聊天"
     },
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 7eeccd6989..18cc169d97 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -89,7 +89,6 @@
         "react": "反應",
         "refresh": "重新整理",
         "register": "註冊",
-        "reject": "拒絕",
         "reload": "重新載入",
         "remove": "移除",
         "rename": "重新命名",
@@ -414,12 +413,12 @@
         "attachment": "附件",
         "authentication": "授權",
         "avatar": "大頭照",
+        "beta": "試用版",
         "camera": "相機",
         "cameras": "相機",
         "capabilities": "功能",
         "copied": "已複製！",
         "credits": "感謝",
-        "cross_signing": "交叉簽署",
         "dark": "暗色",
         "description": "描述",
         "deselect_all": "取消選取",
@@ -785,44 +784,23 @@
     "empty_room_was_name": "空的聊天室（曾為 %(oldName)s）",
     "encryption": {
         "access_secret_storage_dialog": {
-            "enter_phrase_or_key_prompt": "輸入您的安全密語或<button>使用您的安全金鑰</button>以繼續。",
             "key_validation_text": {
-                "invalid_security_key": "無效的安全金鑰",
-                "recovery_key_is_correct": "看起來真棒！",
-                "wrong_file_type": "錯誤的檔案類型",
                 "wrong_security_key": "錯誤的安全金鑰"
             },
-            "reset_title": "重設所有東西",
-            "reset_warning_1": "當您沒有其他裝置可以完成驗證時，才執行此動作。",
-            "reset_warning_2": "如果您重設所有東西，您將會在沒有受信任的工作階段、沒有受信任的使用者的情況下重新啟動，且可能會看不到過去的訊息。",
             "restoring": "從備份還原金鑰",
-            "security_key_title": "安全金鑰",
-            "security_phrase_incorrect_error": "無法存取祕密儲存空間。請確認您輸入了正確的安全密語。",
-            "security_phrase_title": "安全密語",
-            "separator": "%(securityKey)s 或 %(recoveryFile)s",
-            "use_security_key_prompt": "使用您的安全金鑰以繼續。"
+            "security_key_title": "安全金鑰"
         },
         "bootstrap_title": "正在產生金鑰",
         "cancel_entering_passphrase_description": "您確定要取消輸入安全密語嗎？",
         "cancel_entering_passphrase_title": "取消輸入安全密語？",
         "confirm_encryption_setup_body": "點擊下方按鈕以確認設定加密。",
         "confirm_encryption_setup_title": "確認加密設定",
-        "cross_signing_not_ready": "尚未設定交叉簽署。",
-        "cross_signing_ready": "交叉簽署已可使用。",
-        "cross_signing_ready_no_backup": "已準備好交叉簽署但金鑰未備份。",
         "cross_signing_room_normal": "此聊天室已端對端加密",
         "cross_signing_room_verified": "此聊天室中每個人都已驗證",
         "cross_signing_room_warning": "某人正在使用未知的工作階段",
-        "cross_signing_unsupported": "您的家伺服器不支援交叉簽署。",
-        "cross_signing_untrusted": "您的帳號在秘密儲存空間中有交叉簽署的身分，但尚未被此工作階段信任。",
         "cross_signing_user_normal": "您尚未驗證此使用者。",
         "cross_signing_user_verified": "您已驗證此使用者。此使用者已驗證他們所有的工作階段。",
         "cross_signing_user_warning": "此使用者尚未驗證他們的所有工作階段。",
-        "destroy_cross_signing_dialog": {
-            "primary_button_text": "清除交叉簽署金鑰",
-            "title": "摧毀交叉簽署金鑰？",
-            "warning": "永久刪除交叉簽署金鑰。任何您已驗證過的人都會看到安全性警告。除非您遺失了所有可以進行交叉簽署的裝置，否則您不會想要這樣做。"
-        },
         "event_shield_reason_authenticity_not_guaranteed": "無法在此裝置上保證加密訊息的真實性。",
         "event_shield_reason_mismatched_sender_key": "已由未驗證的工作階段加密",
         "export_unsupported": "您的瀏覽器不支援需要的加密擴充",
@@ -842,7 +820,6 @@
             "title": "新復原方法",
             "warning": "如果您沒有設定新的復原方法，攻擊者可能會嘗試存取您的帳號。在設定中立刻變更您的密碼並設定新的復原方法。"
         },
-        "not_supported": "<不支援>",
         "recovery_method_removed": {
             "description_1": "此工作階段偵測到您的安全密語以及安全訊息金鑰已被移除。",
             "description_2": "如果您不小心這樣做了，您可以在此工作階段上設定安全訊息，這將會以新的復原方法重新加密此工作階段的訊息歷史。",
@@ -853,8 +830,7 @@
         "set_up_toast_description": "避免失去對加密訊息與資料的存取權",
         "set_up_toast_title": "設定安全備份",
         "setup_secure_backup": {
-            "explainer": "請在登出前備份您的金鑰，以免遺失。",
-            "title": "設定"
+            "explainer": "請在登出前備份您的金鑰，以免遺失。"
         },
         "udd": {
             "interactive_verification_button": "透過表情符號互動來驗證",
@@ -869,7 +845,6 @@
             "accepting": "正在接受…",
             "after_new_login": {
                 "device_verified": "裝置已驗證",
-                "reset_confirmation": "真的要重設驗證金鑰？",
                 "skip_verification": "暫時略過驗證",
                 "unable_to_verify": "無法驗證此裝置",
                 "verify_this_device": "驗證此裝置"
@@ -939,8 +914,6 @@
             "verify_emoji_prompt": "透過比對獨特的表情符號來進行驗證。",
             "verify_emoji_prompt_qr": "如果您無法掃描上面的條碼，請透過比較獨特的表情符號驗證。",
             "verify_later": "我稍後驗證",
-            "verify_reset_warning_1": "重設您的驗證金鑰將無法復原。重設後，您將無法存取舊的加密訊息，之前任何驗證過您的朋友也會看到安全警告，直到您重新驗證。",
-            "verify_reset_warning_2": "請僅在您確定遺失了您其他所有裝置與安全金鑰時才繼續。",
             "verify_using_device": "用另一台裝置驗證",
             "verify_using_key": "使用安全金鑰進行驗證",
             "verify_using_key_or_phrase": "使用安全金鑰或密語進行驗證",
@@ -999,11 +972,7 @@
             "title": "無法複製聊天室連結"
         },
         "error_loading_user_profile": "無法載入使用者簡介",
-        "forget_room_failed": "無法忘記聊天室 %(errCode)s",
-        "search_failed": {
-            "server_unavailable": "伺服器可能無法使用、超載，或搜尋時間過長 :(",
-            "title": "無法搜尋"
-        }
+        "forget_room_failed": "無法忘記聊天室 %(errCode)s"
     },
     "error_user_not_logged_in": "使用者未登入",
     "event_preview": {
@@ -1063,8 +1032,10 @@
         "format": "格式",
         "from_the_beginning": "從一開始",
         "generating_zip": "產生 ZIP",
+        "html": "HTML",
         "html_title": "已匯出的資料",
         "include_attachments": "包含附件",
+        "json": "JSON",
         "media_omitted": "媒體省略",
         "media_omitted_file_size": "媒體省略 - 超過檔案大小限制",
         "messages": "訊息",
@@ -1229,6 +1200,7 @@
     },
     "keyboard": {
         "activate_button": "啟動已選取按鈕",
+        "alt": "Alt",
         "autocomplete_cancel": "取消自動完成",
         "autocomplete_force": "強制完成",
         "autocomplete_navigate_next": "下一個自動完成建議",
@@ -1254,6 +1226,8 @@
         "composer_undo": "復原編輯",
         "dismiss_read_marker_and_jump_bottom": "清除讀取標記並跳至底部",
         "end": "",
+        "enter": "你好",
+        "escape": "Esc",
         "go_home_view": "前往主畫面",
         "home": "首頁",
         "jump_first_message": "跳至第一則訊息",
@@ -1594,11 +1568,6 @@
         "ongoing": "正在刪除…",
         "reason_label": "理由（選擇性）"
     },
-    "reject_invitation_dialog": {
-        "confirmation": "您確認要拒絕邀請嗎？",
-        "failed": "無法拒絕邀請",
-        "title": "拒絕邀請"
-    },
     "report_content": {
         "description": "回報此訊息將會傳送其獨特的「活動 ID」給您家伺服器的管理員。如果此聊天室中的訊息已加密，您的家伺服器管理員將無法閱讀訊息文字或檢視任何檔案或圖片。",
         "disagree": "不同意",
@@ -1769,7 +1738,6 @@
             "you_created": "您建立了此聊天室。"
         },
         "invite_email_mismatch_suggestion": "在設定中分享此電子郵件以直接在 %(brand)s 中接收邀請。",
-        "invite_reject_ignore": "拒絕並忽略使用者",
         "invite_sent_to_email": "此邀請已傳送至 %(email)s",
         "invite_sent_to_email_room": "此 %(roomName)s 的邀請已傳送給 %(email)s",
         "invite_subtitle": "<userName/> 已邀請您",
@@ -2273,7 +2241,6 @@
             "remove_msisdn_prompt": "移除 %(phone)s？",
             "spell_check_locale_placeholder": "選擇語系"
         },
-        "image_thumbnails": "顯示圖片的預覽／縮圖",
         "inline_url_previews_default": "預設啟用行內網址預覽",
         "inline_url_previews_room": "對此聊天室中的參與者預設啟用網址預覽",
         "inline_url_previews_room_account": "對此聊天室啟用網址預覽（僅影響您）",
@@ -2385,6 +2352,7 @@
             "voip": "音訊與視訊通話"
         },
         "preferences": {
+            "Electron.enableHardwareAcceleration": "啟用硬體加速 (重新啟動%(appName)s以生效)",
             "always_show_menu_bar": "總是顯示視窗選單列",
             "autocomplete_delay": "自動完成延遲（毫秒）",
             "code_blocks_heading": "程式碼區塊",
@@ -2408,50 +2376,17 @@
         "prompt_invite": "在傳送邀請給潛在的無效 Matrix ID 前提示",
         "replace_plain_emoji": "自動取代純文字為表情符號",
         "security": {
-            "4s_public_key_in_account_data": "在帳號資料中",
-            "4s_public_key_status": "秘密儲存空間公鑰：",
-            "backup_key_cached_status": "是否快取備份金鑰：",
-            "backup_key_stored_status": "是否已儲存備份金鑰：",
-            "backup_key_unexpected_type": "預料之外的類型",
-            "backup_key_well_formed": "組成良好",
-            "backup_keys_description": "請備份您帳號的加密金鑰，以防無法使用您的工作階段。您的金鑰會被特殊的安全金鑰保護。",
+            "analytics_description": "共享匿名資料以幫助我們識別問題。沒有個人資料。沒有第三方。",
             "bulk_options_accept_all_invites": "接受所有 %(invitedRooms)s 邀請",
             "bulk_options_reject_all_invites": "拒絕所有 %(invitedRooms)s 邀請",
             "bulk_options_section": "大量選項",
-            "cross_signing_cached": "已快取至本機",
-            "cross_signing_homeserver_support": "家伺服器功能支援：",
-            "cross_signing_homeserver_support_exists": "存在",
-            "cross_signing_in_4s": "在秘密儲存空間中",
-            "cross_signing_in_memory": "在記憶體中",
-            "cross_signing_master_private_Key": "主控私鑰：",
-            "cross_signing_not_cached": "在本機找不到",
-            "cross_signing_not_found": "找不到",
-            "cross_signing_not_in_4s": "在儲存空間中找不到",
-            "cross_signing_not_stored": "未儲存",
-            "cross_signing_private_keys": "交叉簽署的私密金鑰：",
-            "cross_signing_public_keys": "交叉簽署的公開金鑰：",
-            "cross_signing_self_signing_private_key": "自行簽署私鑰：",
-            "cross_signing_user_signing_private_key": "使用者簽署私鑰：",
-            "cryptography_section": "加密",
-            "delete_backup": "刪除備份",
-            "delete_backup_confirm_description": "您確定嗎？如果沒有正確備份金鑰的話，將會遺失所有加密訊息。",
             "e2ee_default_disabled_warning": "您的伺服器管理員已停用在私密聊天室與私人訊息中預設的端對端加密。",
             "enable_message_search": "在已加密的聊天室中啟用訊息搜尋",
             "encryption_section": "加密",
-            "error_loading_key_backup_status": "無法載入金鑰備份狀態",
-            "export_megolm_keys": "匯出聊天室的端對端加密金鑰",
             "ignore_users_empty": "您沒有忽略的使用者。",
             "ignore_users_section": "忽略使用者",
-            "import_megolm_keys": "匯入聊天室端對端加密金鑰",
-            "key_backup_active": "此工作階段正在備份您的金鑰。",
-            "key_backup_active_version_none": "無",
             "key_backup_algorithm": "演算法：",
-            "key_backup_complete": "所有金鑰都已備份",
             "key_backup_connect": "將此工作階段連結至金鑰備份",
-            "key_backup_connect_prompt": "在登出前，請先將此工作階段連線到金鑰備份以避免遺失任何可能僅存在此工作階段中的金鑰。",
-            "key_backup_in_progress": "正在備份 %(sessionsRemaining)s 把金鑰…",
-            "key_backup_inactive": "此工作階段<b>並未備份您的金鑰</b>，您可還原先前的備份後再繼續新增金鑰到備份內容中。",
-            "key_backup_inactive_warning": "您<b>並未備份此裝置的金鑰</b>。",
             "message_search_disable_warning": "若停用，從加密聊天室傳來的訊息將不會出現在搜尋結果中。",
             "message_search_disabled": "將加密的訊息安全地在本機快取以出現在顯示結果中。",
             "message_search_enabled": {
@@ -2471,13 +2406,7 @@
             "message_search_unsupported": "%(brand)s 缺少某些在本機快取已加密訊息所需的元件。如果您想要實驗此功能，請加入<nativeLink>搜尋元件</nativeLink>來自行建構 %(brand)s 桌面版。",
             "message_search_unsupported_web": "%(brand)s 無法在網頁瀏覽器中執行時，安全地在本機快取加密訊息。若需搜尋加密訊息，請使用 <desktopLink>%(brand)s 桌面版</desktopLink>。",
             "record_session_details": "記錄客戶端名稱、版本與網址，以便在工作階段管理員當中能更輕鬆找出工作階段",
-            "restore_key_backup": "從備份還原",
-            "secret_storage_not_ready": "尚未準備好",
-            "secret_storage_ready": "已準備好",
-            "secret_storage_status": "秘密儲存空間：",
             "send_analytics": "傳送分析資料",
-            "session_id": "工作階段 ID：",
-            "session_key": "工作階段金鑰：",
             "strict_encryption": "不要從此工作階段傳送加密訊息到未驗證的工作階段"
         },
         "send_read_receipts": "傳送讀取回條",
@@ -2597,6 +2526,7 @@
             "metaspaces_orphans_description": "將所有不屬於某個聊天空間的聊天室集中在同一個地方。",
             "metaspaces_people_description": "將您所有的夥伴集中在同一個地方。",
             "metaspaces_subsection": "要顯示的聊天空間",
+            "spaces_explainer": "空間是將房間和人群分組的方式。除了您所在的空間之外，您也可以使用一些預先構建的空間。",
             "title": "側邊欄"
         },
         "start_automatically": "在系統登入後自動開始",
@@ -2701,8 +2631,6 @@
         "topic": "取得或設定聊天室主題",
         "topic_none": "此聊天室沒有主題。",
         "topic_room_error": "無法取得聊天室主題：找不到聊天室（%(roomId)s）",
-        "tovirtual": "切換到此聊天室的虛擬聊天室（若有）",
-        "tovirtual_not_found": "此聊天室沒有虛擬聊天室",
         "unban": "取消封鎖特定 ID 的使用者",
         "unflip": "在純文字訊息前加入 ┬──┬ ノ( ゜-゜ノ)",
         "unholdcall": "取消目前聊天室通話等候接聽狀態",
@@ -2823,7 +2751,6 @@
         "heading_without_query": "搜尋",
         "join_button_text": "加入 %(roomAddress)s",
         "keyboard_scroll_hint": "使用 <arrows/> 捲動",
-        "message_search_section_title": "其他搜尋",
         "other_rooms_in_space": "其他在 %(spaceName)s 中的聊天室",
         "public_rooms_label": "公開聊天室",
         "recent_searches_section_title": "近期搜尋",
@@ -2832,7 +2759,6 @@
         "result_may_be_hidden_privacy_warning": "出於隱私考量，可能會隱藏一些結果",
         "result_may_be_hidden_warning": "某些結果可能會被隱藏",
         "search_dialog": "搜尋對話方塊",
-        "search_messages_hint": "要搜尋訊息，請在聊天室頂部尋找此圖示 <icon/>",
         "spaces_title": "您所在的聊天空間",
         "start_group_chat_button": "開始群組聊天"
     },
@@ -2895,9 +2821,13 @@
         "n_hours_ago": "%(num)s 小時前",
         "n_minutes_ago": "%(num)s 分鐘前",
         "seconds_left": "剩 %(seconds)s 秒",
+        "short_days": "%(value)sd",
         "short_days_hours_minutes_seconds": "%(days)s 天 %(hours)s 小時 %(minutes)s 分鐘 %(seconds)s 秒",
+        "short_hours": "%(value)sh",
         "short_hours_minutes_seconds": "%(hours)s 小時 %(minutes)s 分鐘 %(seconds)s 秒",
-        "short_minutes_seconds": "%(minutes)s 分鐘 %(seconds)s 秒"
+        "short_minutes": "%(value)sm",
+        "short_minutes_seconds": "%(minutes)s 分鐘 %(seconds)s 秒",
+        "short_seconds": "%(value)sS"
     },
     "timeline": {
         "context_menu": {
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 865430fb9e..175f9c149f 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -113,6 +113,10 @@ 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
@@ -124,30 +128,26 @@ export function _td(s: TranslationKey): TranslationKey {
  * */
 const translateWithFallback = (text: string, options?: IVariables): { translated: string; isFallback?: boolean } => {
     const translated = counterpart.translate(text, { ...options, fallbackLocale: counterpart.getLocale() });
-    if (!translated || translated.startsWith("missing translation:")) {
-        const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
-        if (
-            (!fallbackTranslated || fallbackTranslated.startsWith("missing translation:")) &&
-            process.env.NODE_ENV !== "development"
-        ) {
-            // 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 untranslated text, which
-            // will be in English, so the user can still make out *something*, rather than an opaque
-            // "missing translation" error.
-            //
-            // Don't do this in develop so people remember to run yarn i18n.
-            return { translated: text, isFallback: true };
-        }
+    if (isValidTranslation(translated)) {
+        return { translated };
+    }
+
+    const fallbackTranslated = counterpart.translate(text, { ...options, locale: FALLBACK_LOCALE });
+    if (isValidTranslation(fallbackTranslated)) {
         return { translated: fallbackTranslated, isFallback: true };
     }
-    return { translated };
+
+    // 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
@@ -454,55 +454,35 @@ type Languages = {
     [lang: string]: string;
 };
 
-export function setLanguage(preferredLangs: string | string[]): Promise<void> {
-    if (!Array.isArray(preferredLangs)) {
-        preferredLangs = [preferredLangs];
+export async function setLanguage(...preferredLangs: string[]): Promise<void> {
+    PlatformPeg.get()?.setLanguage(preferredLangs);
+
+    const availableLanguages = await getLangsJson();
+    let chosenLanguage = preferredLangs.find((lang) => availableLanguages.hasOwnProperty(lang));
+    if (!chosenLanguage) {
+        // Fallback to en_EN if none is found
+        chosenLanguage = "en";
+        logger.error("Unable to find an appropriate language, preferred: ", preferredLangs);
     }
 
-    const plaf = PlatformPeg.get();
-    if (plaf) {
-        plaf.setLanguage(preferredLangs);
+    const languageData = await getLanguageRetry(i18nFolder + availableLanguages[chosenLanguage]);
+
+    counterpart.registerTranslations(chosenLanguage, languageData);
+    counterpart.setLocale(chosenLanguage);
+
+    await SettingsStore.setValue("language", null, SettingLevel.DEVICE, chosenLanguage);
+    // Adds a lot of noise to test runs, so disable logging there.
+    if (process.env.NODE_ENV !== "test") {
+        logger.log("set language to " + chosenLanguage);
     }
 
-    let langToUse: string;
-    let availLangs: Languages;
-    return getLangsJson()
-        .then((result) => {
-            availLangs = result;
+    // Set 'en' as fallback language:
+    if (chosenLanguage !== "en") {
+        const fallbackLanguageData = await getLanguageRetry(i18nFolder + availableLanguages["en"]);
+        counterpart.registerTranslations("en", fallbackLanguageData);
+    }
 
-            for (let i = 0; i < preferredLangs.length; ++i) {
-                if (availLangs.hasOwnProperty(preferredLangs[i])) {
-                    langToUse = preferredLangs[i];
-                    break;
-                }
-            }
-            if (!langToUse) {
-                // Fallback to en_EN if none is found
-                langToUse = "en";
-                logger.error("Unable to find an appropriate language");
-            }
-
-            return getLanguageRetry(i18nFolder + availLangs[langToUse]);
-        })
-        .then(async (langData): Promise<ICounterpartTranslation | undefined> => {
-            counterpart.registerTranslations(langToUse, langData);
-            await registerCustomTranslations();
-            counterpart.setLocale(langToUse);
-            await SettingsStore.setValue("language", null, SettingLevel.DEVICE, langToUse);
-            // Adds a lot of noise to test runs, so disable logging there.
-            if (process.env.NODE_ENV !== "test") {
-                logger.log("set language to " + langToUse);
-            }
-
-            // Set 'en' as fallback language:
-            if (langToUse !== "en") {
-                return getLanguageRetry(i18nFolder + availLangs["en"]);
-            }
-        })
-        .then(async (langData): Promise<void> => {
-            if (langData) counterpart.registerTranslations("en", langData);
-            await registerCustomTranslations();
-        });
+    await registerCustomTranslations();
 }
 
 type Language = {
@@ -529,8 +509,7 @@ export async function getAllLanguagesWithLabels(): Promise<Language[]> {
 
 export function getLanguagesFromBrowser(): readonly string[] {
     if (navigator.languages && navigator.languages.length) return navigator.languages;
-    if (navigator.language) return [navigator.language];
-    return [navigator.userLanguage || "en"];
+    return [navigator.language ?? "en"];
 }
 
 export function getLanguageFromBrowser(): string {
diff --git a/src/linkify-matrix.ts b/src/linkify-matrix.ts
index c22445bb96..0a96e088e9 100644
--- a/src/linkify-matrix.ts
+++ b/src/linkify-matrix.ts
@@ -198,7 +198,7 @@ export const options: Opts = {
         rel: "noreferrer noopener",
     },
 
-    ignoreTags: ["pre", "code"],
+    ignoreTags: ["a", "pre", "code"],
 
     className: "linkified",
 
diff --git a/src/models/Call.ts b/src/models/Call.ts
index 60ff2b2ffa..70c7e4779f 100644
--- a/src/models/Call.ts
+++ b/src/models/Call.ts
@@ -85,15 +85,9 @@ export enum ConnectionState {
 export const isConnected = (state: ConnectionState): boolean =>
     state === ConnectionState.Connected || state === ConnectionState.Disconnecting;
 
-export enum Layout {
-    Tile = "tile",
-    Spotlight = "spotlight",
-}
-
 export enum CallEvent {
     ConnectionState = "connection_state",
     Participants = "participants",
-    Layout = "layout",
     Close = "close",
     Destroy = "destroy",
 }
@@ -104,7 +98,6 @@ interface CallEventHandlerMap {
         participants: Map<RoomMember, Set<string>>,
         prevParticipants: Map<RoomMember, Set<string>>,
     ) => void;
-    [CallEvent.Layout]: (layout: Layout) => void;
     [CallEvent.Close]: () => void;
     [CallEvent.Destroy]: () => void;
 }
@@ -658,14 +651,6 @@ export class ElementCall extends Call {
 
     private settingsStoreCallEncryptionWatcher?: string;
     private terminationTimer?: number;
-    private _layout = Layout.Tile;
-    public get layout(): Layout {
-        return this._layout;
-    }
-    protected set layout(value: Layout) {
-        this._layout = value;
-        this.emit(CallEvent.Layout, value);
-    }
 
     public get presented(): boolean {
         return super.presented;
@@ -686,7 +671,6 @@ export class ElementCall extends Call {
         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.
-            preload: "$preload", // We want it to load in the background.
             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",
@@ -756,17 +740,13 @@ 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, preload = false
+    // 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, preload).
-    //
-    // `preload` is deprecated. We used it for optimizing EC by using a custom EW call lobby and preloading the iframe.
-    // now it should always be false.
+    // by passing the according parameters (skipLobby).
     private static createOrGetCallWidget(
         roomId: string,
         client: MatrixClient,
         skipLobby: boolean | undefined,
-        preload: boolean | undefined,
         returnToLobby: boolean | undefined,
     ): IApp {
         const ecWidget = WidgetStore.instance.getApps(roomId).find((app) => WidgetType.CALL.matches(app.type));
@@ -777,9 +757,6 @@ export class ElementCall extends Call {
             if (skipLobby !== undefined) {
                 overwrites.skipLobby = skipLobby;
             }
-            if (preload !== undefined) {
-                overwrites.preload = preload;
-            }
             if (returnToLobby !== undefined) {
                 overwrites.returnToLobby = returnToLobby;
             }
@@ -804,7 +781,6 @@ export class ElementCall extends Call {
                     {},
                     {
                         skipLobby: skipLobby ?? false,
-                        preload: preload ?? false,
                         returnToLobby: returnToLobby ?? false,
                     },
                 ),
@@ -870,7 +846,6 @@ export class ElementCall extends Call {
                 room.roomId,
                 room.client,
                 undefined,
-                undefined,
                 isVideoRoom(room),
             );
             return new ElementCall(session, availableOrCreatedWidget, room.client);
@@ -880,7 +855,7 @@ export class ElementCall extends Call {
     }
 
     public static create(room: Room, skipLobby = false): void {
-        ElementCall.createOrGetCallWidget(room.roomId, room.client, skipLobby, false, isVideoRoom(room));
+        ElementCall.createOrGetCallWidget(room.roomId, room.client, skipLobby, isVideoRoom(room));
     }
 
     protected async sendCallNotify(): Promise<void> {
@@ -912,19 +887,6 @@ export class ElementCall extends Call {
         audioInput: MediaDeviceInfo | null,
         videoInput: MediaDeviceInfo | null,
     ): Promise<void> {
-        // The JoinCall action is only send if the widget is waiting for it.
-        if (this.widget.data?.preload) {
-            try {
-                await this.messaging!.transport.send(ElementWidgetActions.JoinCall, {
-                    audioInput: audioInput?.label ?? null,
-                    videoInput: videoInput?.label ?? null,
-                });
-            } catch (e) {
-                throw new Error(`Failed to join call in room ${this.roomId}: ${e}`);
-            }
-        }
-        this.messaging!.on(`action:${ElementWidgetActions.TileLayout}`, this.onTileLayout);
-        this.messaging!.on(`action:${ElementWidgetActions.SpotlightLayout}`, this.onSpotlightLayout);
         this.messaging!.on(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
         this.messaging!.once(`action:${ElementWidgetActions.Close}`, this.onClose);
         this.messaging!.on(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
@@ -968,8 +930,6 @@ export class ElementCall extends Call {
     }
 
     public setDisconnected(): void {
-        this.messaging!.off(`action:${ElementWidgetActions.TileLayout}`, this.onTileLayout);
-        this.messaging!.off(`action:${ElementWidgetActions.SpotlightLayout}`, this.onSpotlightLayout);
         this.messaging!.off(`action:${ElementWidgetActions.HangupCall}`, this.onHangup);
         this.messaging!.off(`action:${ElementWidgetActions.DeviceMute}`, this.onDeviceMute);
         super.setDisconnected();
@@ -994,15 +954,6 @@ export class ElementCall extends Call {
         if (this.session.memberships.length === 0 && !this.presented && !this.room.isCallRoom()) this.destroy();
     };
 
-    /**
-     * Sets the call's layout.
-     * @param layout The layout to switch to.
-     */
-    public async setLayout(layout: Layout): Promise<void> {
-        const action = layout === Layout.Tile ? ElementWidgetActions.TileLayout : ElementWidgetActions.SpotlightLayout;
-        await this.messaging!.transport.send(action, {});
-    }
-
     private readonly onMembershipChanged = (): void => this.updateParticipants();
 
     private updateParticipants(): void {
@@ -1046,18 +997,6 @@ export class ElementCall extends Call {
         this.close();
     };
 
-    private readonly onTileLayout = async (ev: CustomEvent<IWidgetApiRequest>): Promise<void> => {
-        ev.preventDefault();
-        this.layout = Layout.Tile;
-        this.messaging!.transport.reply(ev.detail, {}); // ack
-    };
-
-    private readonly onSpotlightLayout = async (ev: CustomEvent<IWidgetApiRequest>): Promise<void> => {
-        ev.preventDefault();
-        this.layout = Layout.Spotlight;
-        this.messaging!.transport.reply(ev.detail, {}); // ack
-    };
-
     public clean(): Promise<void> {
         return Promise.resolve();
     }
diff --git a/src/modules/Api.ts b/src/modules/Api.ts
index ad87088840..23abadf529 100644
--- a/src/modules/Api.ts
+++ b/src/modules/Api.ts
@@ -5,7 +5,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 type { Api, RuntimeModuleConstructor, Config } from "@element-hq/element-web-module-api";
+import { createRoot, type Root } from "react-dom/client";
+
+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";
@@ -17,7 +19,8 @@ import * as MediaCustomisations from "../customisations/Media.ts";
 import UserIdentifierCustomisations from "../customisations/UserIdentifier.ts";
 import { WidgetPermissionCustomisations } from "../customisations/WidgetPermissions.ts";
 import { WidgetVariableCustomisations } from "../customisations/WidgetVariables.ts";
-import SdkConfig from "../SdkConfig.ts";
+import { ConfigApi } from "./ConfigApi.ts";
+import { I18nApi } from "./I18nApi.ts";
 
 const legacyCustomisationsFactory = <T extends object>(baseCustomisations: T) => {
     let used = false;
@@ -28,17 +31,6 @@ const legacyCustomisationsFactory = <T extends object>(baseCustomisations: T) =>
     };
 };
 
-class ConfigApi {
-    public get(): Config;
-    public get<K extends keyof Config>(key: K): Config[K];
-    public get<K extends keyof Config = never>(key?: K): Config | Config[K] {
-        if (key === undefined) {
-            return SdkConfig.get() as Config;
-        }
-        return SdkConfig.get(key);
-    }
-}
-
 /**
  * Implementation of the @element-hq/element-web-module-api runtime module API.
  */
@@ -65,6 +57,12 @@ class ModuleApi implements Api {
     /* eslint-enable @typescript-eslint/naming-convention */
 
     public readonly config = new ConfigApi();
+    public readonly i18n = new I18nApi();
+    public readonly rootNode = document.getElementById("matrixchat")!;
+
+    public createRoot(element: Element): Root {
+        return createRoot(element);
+    }
 }
 
 export type ModuleApiType = ModuleApi;
diff --git a/src/modules/ConfigApi.ts b/src/modules/ConfigApi.ts
new file mode 100644
index 0000000000..512a1c4abe
--- /dev/null
+++ b/src/modules/ConfigApi.ts
@@ -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 type { ConfigApi as IConfigApi, Config } from "@element-hq/element-web-module-api";
+import SdkConfig from "../SdkConfig.ts";
+
+export class ConfigApi implements IConfigApi {
+    public get(): Config;
+    public get<K extends keyof Config>(key: K): Config[K];
+    public get<K extends keyof Config = never>(key?: K): Config | Config[K] {
+        if (key === undefined) {
+            return SdkConfig.get() as Config;
+        }
+        return SdkConfig.get(key);
+    }
+}
diff --git a/src/modules/I18nApi.ts b/src/modules/I18nApi.ts
new file mode 100644
index 0000000000..43c101eca6
--- /dev/null
+++ b/src/modules/I18nApi.ts
@@ -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.
+*/
+
+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";
+
+export class I18nApi implements II18nApi {
+    /**
+     * Read the current language of the user in IETF Language Tag format
+     */
+    public get language(): string {
+        return getCurrentLanguage();
+    }
+
+    /**
+     * Register translations for the module, may override app's existing translations
+     */
+    public register(translations: Partial<Translations>): void {
+        const langs: Record<string, Record<string, string>> = {};
+        for (const key in translations) {
+            for (const lang in translations[key]) {
+                langs[lang] = langs[lang] || {};
+                langs[lang][key] = translations[key][lang];
+            }
+        }
+
+        // Finally, tell counterpart about our translations
+        for (const lang in langs) {
+            counterpart.registerTranslations(lang, langs[lang]);
+        }
+    }
+
+    /**
+     * Perform a translation, with optional variables
+     * @param key - The key to translate
+     * @param variables - Optional variables to interpolate into the translation
+     */
+    public translate(key: TranslationKey, variables?: Variables): string {
+        return _t(key, variables);
+    }
+}
diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
index aee9141c29..3ca7503cd1 100644
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -10,6 +10,7 @@ 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 { type MediaPreviewConfig } from "../@types/media_preview.ts";
 import { _t, _td, type TranslationKey } from "../languageHandler";
 import DeviceIsolationModeController from "./controllers/DeviceIsolationModeController.ts";
 import {
@@ -45,6 +46,9 @@ import { type Json, type JsonValue } from "../@types/json.ts";
 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";
 
 export const defaultWatchManager = new WatchManager();
 
@@ -312,8 +316,6 @@ export interface Settings {
     "showHiddenEventsInTimeline": IBaseSetting<boolean>;
     "lowBandwidth": IBaseSetting<boolean>;
     "fallbackICEServerAllowed": IBaseSetting<boolean | null>;
-    "showImages": IBaseSetting<boolean>;
-    "showAvatarsOnInvites": IBaseSetting<boolean>;
     "RoomList.preferredSorting": IBaseSetting<SortingAlgorithm>;
     "RoomList.showMessagePreview": IBaseSetting<boolean>;
     "RightPanel.phasesGlobal": IBaseSetting<IRightPanelForRoomStored | null>;
@@ -349,6 +351,9 @@ export interface Settings {
     "Electron.alwaysShowMenuBar": IBaseSetting<boolean>;
     "Electron.showTrayIcon": IBaseSetting<boolean>;
     "Electron.enableHardwareAcceleration": IBaseSetting<boolean>;
+    "Electron.enableContentProtection": IBaseSetting<boolean>;
+    "mediaPreviewConfig": IBaseSetting<MediaPreviewConfig>;
+    "inviteRules": IBaseSetting<ComputedInviteConfig>;
     "Developer.elementCallUrl": IBaseSetting<string>;
 }
 
@@ -427,6 +432,16 @@ export const SETTINGS: Settings = {
         supportedLevelsAreOrdered: true,
         default: false,
     },
+    "mediaPreviewConfig": {
+        controller: new MediaPreviewConfigController(),
+        supportedLevels: LEVELS_ROOM_SETTINGS,
+        default: MediaPreviewConfigController.default,
+    },
+    "inviteRules": {
+        controller: new InviteRulesConfigController(),
+        supportedLevels: [SettingLevel.ACCOUNT],
+        default: InviteRulesConfigController.default,
+    },
     "feature_report_to_moderators": {
         isFeature: true,
         labsGroup: LabGroup.Moderation,
@@ -888,7 +903,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,
@@ -1123,16 +1138,6 @@ export const SETTINGS: Settings = {
         default: null,
         controller: new FallbackIceServerController(),
     },
-    "showImages": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("settings|image_thumbnails"),
-        default: true,
-    },
-    "showAvatarsOnInvites": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        displayName: _td("settings|invite_avatars"),
-        default: true,
-    },
     "RoomList.preferredSorting": {
         supportedLevels: [SettingLevel.DEVICE],
         default: SortingAlgorithm.Recency,
@@ -1140,6 +1145,7 @@ export const SETTINGS: Settings = {
     "RoomList.showMessagePreview": {
         supportedLevels: [SettingLevel.DEVICE],
         default: false,
+        displayName: _td("settings|show_message_previews"),
     },
     "RightPanel.phasesGlobal": {
         supportedLevels: [SettingLevel.DEVICE],
@@ -1386,7 +1392,11 @@ export const SETTINGS: Settings = {
         displayName: _td("settings|preferences|enable_hardware_acceleration"),
         default: true,
     },
-
+    "Electron.enableContentProtection": {
+        supportedLevels: [SettingLevel.PLATFORM],
+        displayName: _td("settings|preferences|enable_hardware_acceleration"),
+        default: false,
+    },
     "Developer.elementCallUrl": {
         supportedLevels: [SettingLevel.DEVICE],
         displayName: _td("devtools|settings|elementCallUrl"),
diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts
index 7dac777399..aaa836b6fc 100644
--- a/src/settings/SettingsStore.ts
+++ b/src/settings/SettingsStore.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2017 Travis Ralston
 
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { logger } from "matrix-js-sdk/src/logger";
 import { type ReactNode } from "react";
-import { ClientEvent, SyncState } from "matrix-js-sdk/src/matrix";
+import { ClientEvent } from "matrix-js-sdk/src/matrix";
 
 import DeviceSettingsHandler from "./handlers/DeviceSettingsHandler";
 import RoomDeviceSettingsHandler from "./handlers/RoomDeviceSettingsHandler";
@@ -38,6 +38,7 @@ import { Action } from "../dispatcher/actions";
 import PlatformSettingsHandler from "./handlers/PlatformSettingsHandler";
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
 import { MatrixClientPeg } from "../MatrixClientPeg";
+import { MediaPreviewValue } from "../@types/media_preview";
 
 // Convert the settings to easier to manage objects for the handlers
 const defaultSettings: Record<string, any> = {};
@@ -666,35 +667,25 @@ export default class SettingsStore {
 
         const client = MatrixClientPeg.safeGet();
 
-        const doMigration = async (): Promise<void> => {
-            logger.info("Performing one-time settings migration of URL previews in E2EE rooms");
+        while (!client.isInitialSyncComplete()) {
+            await new Promise((r) => client.once(ClientEvent.Sync, r));
+        }
 
-            const roomAccounthandler = LEVEL_HANDLERS[SettingLevel.ROOM_ACCOUNT];
+        logger.info("Performing one-time settings migration of URL previews in E2EE rooms");
 
-            for (const room of client.getRooms()) {
-                // We need to use the handler directly because this setting is no longer supported
-                // at this level at all
-                const val = roomAccounthandler.getValue("urlPreviewsEnabled_e2ee", room.roomId);
+        const roomAccounthandler = LEVEL_HANDLERS[SettingLevel.ROOM_ACCOUNT];
 
-                if (val !== undefined) {
-                    await SettingsStore.setValue("urlPreviewsEnabled_e2ee", room.roomId, SettingLevel.ROOM_DEVICE, val);
-                }
+        for (const room of client.getRooms()) {
+            // We need to use the handler directly because this setting is no longer supported
+            // at this level at all
+            const val = roomAccounthandler.getValue("urlPreviewsEnabled_e2ee", room.roomId);
+
+            if (val !== undefined) {
+                await SettingsStore.setValue("urlPreviewsEnabled_e2ee", room.roomId, SettingLevel.ROOM_DEVICE, val);
             }
+        }
 
-            localStorage.setItem(MIGRATION_DONE_FLAG, "true");
-        };
-
-        const onSync = (state: SyncState): void => {
-            if (state === SyncState.Prepared) {
-                client.removeListener(ClientEvent.Sync, onSync);
-
-                doMigration().catch((e) => {
-                    logger.error("Failed to migrate URL previews in E2EE rooms:", e);
-                });
-            }
-        };
-
-        client.on(ClientEvent.Sync, onSync);
+        localStorage.setItem(MIGRATION_DONE_FLAG, "true");
     }
 
     /**
@@ -715,6 +706,35 @@ export default class SettingsStore {
         localStorage.setItem(MIGRATION_DONE_FLAG, "true");
     }
 
+    /**
+     * Migrate the setting for visible images to a setting.
+     *
+     * @param isFreshLogin True if the user has just logged in, false if a previous session is being restored.
+     */
+    private static async migrateMediaControlsToSetting(isFreshLogin: boolean): Promise<void> {
+        if (isFreshLogin) return;
+        const client = MatrixClientPeg.safeGet();
+
+        while (!client.isInitialSyncComplete()) {
+            await new Promise((r) => client.once(ClientEvent.Sync, r));
+        }
+        // Never migrate if the config already exists.
+        if (client.getAccountData("io.element.msc4278.media_preview_config")) {
+            return;
+        }
+        logger.info("Performing one-time settings migration of show images and invite avatars to account data");
+        const handler = LEVEL_HANDLERS[SettingLevel.ACCOUNT];
+        const showImages = handler.getValue("showImages", null);
+        const showAvatarsOnInvites = handler.getValue("showAvatarsOnInvites", null);
+
+        if (typeof showImages === "boolean" || typeof showAvatarsOnInvites === "boolean") {
+            this.setValue("mediaPreviewConfig", null, SettingLevel.ACCOUNT, {
+                invite_avatars: showAvatarsOnInvites === false ? MediaPreviewValue.Off : MediaPreviewValue.On,
+                media_previews: showImages === false ? MediaPreviewValue.Off : MediaPreviewValue.On,
+            });
+        } // else, we don't set anything and use the server value
+    }
+
     /**
      * Runs or queues any setting migrations needed.
      */
@@ -724,7 +744,9 @@ export default class SettingsStore {
         // (so around October 2024).
         // The consequences of missing the migration are only that URL previews will
         // be disabled in E2EE rooms.
-        SettingsStore.migrateURLPreviewsE2EE(isFreshLogin);
+        SettingsStore.migrateURLPreviewsE2EE(isFreshLogin).catch((e) => {
+            logger.error("Failed to migrate URL previews in E2EE rooms:", e);
+        });
 
         // This can be removed once enough users have run a version of Element with
         // this migration.
@@ -732,6 +754,13 @@ export default class SettingsStore {
         // will now be hidden again, so this fails safely.
         SettingsStore.migrateShowImagesToSettings();
 
+        // This can be removed once enough users have run a version of Element with
+        // this migration.
+        // The consequences of missing the migration are that the previously set
+        // media controls for this user will be missing
+        SettingsStore.migrateMediaControlsToSetting(isFreshLogin).catch((e) => {
+            logger.error("Failed to migrate media config settings", e);
+        });
         // Dev notes: to add your migration, just add a new `migrateMyFeature` function, call it, and
         // add a comment to note when it can be removed.
         return;
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/MatrixClientBackedController.ts b/src/settings/controllers/MatrixClientBackedController.ts
index c7816222d5..b305ad5fa2 100644
--- a/src/settings/controllers/MatrixClientBackedController.ts
+++ b/src/settings/controllers/MatrixClientBackedController.ts
@@ -26,7 +26,7 @@ export default abstract class MatrixClientBackedController extends SettingContro
         MatrixClientBackedController._matrixClient = client;
 
         for (const instance of MatrixClientBackedController.instances) {
-            instance.initMatrixClient(client, oldClient);
+            instance.initMatrixClient?.(client, oldClient);
         }
     }
 
@@ -40,5 +40,5 @@ export default abstract class MatrixClientBackedController extends SettingContro
         return MatrixClientBackedController._matrixClient;
     }
 
-    protected abstract initMatrixClient(newClient: MatrixClient, oldClient?: MatrixClient): void;
+    protected initMatrixClient?(newClient: MatrixClient, oldClient?: MatrixClient): void;
 }
diff --git a/src/settings/controllers/MediaPreviewConfigController.ts b/src/settings/controllers/MediaPreviewConfigController.ts
new file mode 100644
index 0000000000..cb8b9b34aa
--- /dev/null
+++ b/src/settings/controllers/MediaPreviewConfigController.ts
@@ -0,0 +1,100 @@
+/*
+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 IContent } from "matrix-js-sdk/src/matrix";
+import { type AccountDataEvents } from "matrix-js-sdk/src/types";
+
+import {
+    MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+    type MediaPreviewConfig,
+    MediaPreviewValue,
+} from "../../@types/media_preview.ts";
+import { type SettingLevel } from "../SettingLevel.ts";
+import MatrixClientBackedController from "./MatrixClientBackedController.ts";
+
+/**
+ * Handles media preview settings provided by MSC4278.
+ * This uses both account-level and room-level account data.
+ */
+export default class MediaPreviewConfigController extends MatrixClientBackedController {
+    public static readonly default: AccountDataEvents[typeof MEDIA_PREVIEW_ACCOUNT_DATA_TYPE] = {
+        media_previews: MediaPreviewValue.On,
+        invite_avatars: MediaPreviewValue.On,
+    };
+
+    private static getValidSettingData(content: IContent): Partial<MediaPreviewConfig> {
+        const mediaPreviews: MediaPreviewConfig["media_previews"] = content.media_previews;
+        const inviteAvatars: MediaPreviewConfig["invite_avatars"] = content.invite_avatars;
+        const validMediaPreviews = Object.values(MediaPreviewValue);
+        const validInviteAvatars = [MediaPreviewValue.Off, MediaPreviewValue.On];
+        return {
+            invite_avatars: validInviteAvatars.includes(inviteAvatars) ? inviteAvatars : undefined,
+            media_previews: validMediaPreviews.includes(mediaPreviews) ? mediaPreviews : undefined,
+        };
+    }
+
+    public constructor() {
+        super();
+    }
+
+    private getValue = (roomId?: string): MediaPreviewConfig => {
+        const source = roomId ? this.client?.getRoom(roomId) : this.client;
+        const accountData =
+            source?.getAccountData(MEDIA_PREVIEW_ACCOUNT_DATA_TYPE)?.getContent<MediaPreviewConfig>() ?? {};
+
+        const calculatedConfig = MediaPreviewConfigController.getValidSettingData(accountData);
+
+        // Save an account data fetch if we have all the values.
+        if (calculatedConfig.invite_avatars && calculatedConfig.media_previews) {
+            return calculatedConfig as MediaPreviewConfig;
+        }
+
+        // We're missing some keys.
+        if (roomId) {
+            const globalConfig = this.getValue();
+            return {
+                invite_avatars:
+                    calculatedConfig.invite_avatars ??
+                    globalConfig.invite_avatars ??
+                    MediaPreviewConfigController.default.invite_avatars,
+                media_previews:
+                    calculatedConfig.media_previews ??
+                    globalConfig.media_previews ??
+                    MediaPreviewConfigController.default.media_previews,
+            };
+        }
+        return {
+            invite_avatars: calculatedConfig.invite_avatars ?? MediaPreviewConfigController.default.invite_avatars,
+            media_previews: calculatedConfig.media_previews ?? MediaPreviewConfigController.default.media_previews,
+        };
+    };
+
+    public getValueOverride(_level: SettingLevel, roomId: string | null): MediaPreviewConfig {
+        return this.getValue(roomId ?? undefined);
+    }
+
+    public get settingDisabled(): false {
+        // No homeserver support is required for this MSC.
+        return false;
+    }
+
+    public async beforeChange(
+        _level: SettingLevel,
+        roomId: string | null,
+        newValue: MediaPreviewConfig,
+    ): Promise<boolean> {
+        if (!this.client) {
+            return false;
+        }
+        if (roomId) {
+            await this.client.setRoomAccountData(roomId, MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, newValue);
+            return true;
+        }
+        await this.client.setAccountData(MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, newValue);
+        return true;
+    }
+}
diff --git a/src/settings/handlers/AccountSettingsHandler.ts b/src/settings/handlers/AccountSettingsHandler.ts
index 6afd560867..29117778d6 100644
--- a/src/settings/handlers/AccountSettingsHandler.ts
+++ b/src/settings/handlers/AccountSettingsHandler.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2017 Travis Ralston
 
@@ -8,13 +8,13 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type AccountDataEvents, ClientEvent, type MatrixClient, type MatrixEvent } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 import { isEqual } from "lodash";
 
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import { objectClone, objectKeyChanges } from "../../utils/objects";
 import { SettingLevel } from "../SettingLevel";
 import { type WatchManager } from "../WatchManager";
+import { MEDIA_PREVIEW_ACCOUNT_DATA_TYPE } from "../../@types/media_preview";
 
 const BREADCRUMBS_LEGACY_EVENT_TYPE = "im.vector.riot.breadcrumb_rooms";
 const BREADCRUMBS_EVENT_TYPE = "im.vector.setting.breadcrumbs";
@@ -68,6 +68,8 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         } else if (event.getType() === RECENT_EMOJI_EVENT_TYPE) {
             const val = event.getContent()["enabled"];
             this.watchers.notifyUpdate("recent_emoji", null, SettingLevel.ACCOUNT, val);
+        } else if (event.getType() === MEDIA_PREVIEW_ACCOUNT_DATA_TYPE) {
+            this.watchers.notifyUpdate("mediaPreviewConfig", null, SettingLevel.ROOM_ACCOUNT, event.getContent());
         }
     };
 
@@ -159,7 +161,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
 
         // Attach a deferred *before* setting the account data to ensure we catch any requests
         // which race between different lines.
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         const handler = (event: MatrixEvent): void => {
             if (event.getType() !== eventType || !isEqual(event.getContent<AccountDataEvents[K]>()[field], value))
                 return;
@@ -173,7 +175,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
         await deferred.promise;
     }
 
-    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         switch (settingName) {
             // Special case URL previews
             case "urlPreviewsEnabled":
@@ -199,7 +201,12 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
             // Special case analytics
             case "pseudonymousAnalyticsOptIn":
                 return this.setAccountData(ANALYTICS_EVENT_TYPE, "pseudonymousAnalyticsOptIn", newValue);
-
+            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/RoomAccountSettingsHandler.ts b/src/settings/handlers/RoomAccountSettingsHandler.ts
index 045ef5cfe0..6ed09a9801 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.ts
+++ b/src/settings/handlers/RoomAccountSettingsHandler.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 New Vector Ltd.
+Copyright 2024, 2025 New Vector Ltd.
 Copyright 2019, 2020 The Matrix.org Foundation C.I.C.
 Copyright 2017 Travis Ralston
 
@@ -8,12 +8,12 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { type MatrixClient, type MatrixEvent, type Room, RoomEvent } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import { objectClone, objectKeyChanges } from "../../utils/objects";
 import { SettingLevel } from "../SettingLevel";
 import { type WatchManager } from "../WatchManager";
+import { MEDIA_PREVIEW_ACCOUNT_DATA_TYPE } from "../../@types/media_preview";
 
 const ALLOWED_WIDGETS_EVENT_TYPE = "im.vector.setting.allowed_widgets";
 const DEFAULT_SETTINGS_EVENT_TYPE = "im.vector.web.settings";
@@ -56,6 +56,8 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             }
         } else if (event.getType() === ALLOWED_WIDGETS_EVENT_TYPE) {
             this.watchers.notifyUpdate("allowedWidgets", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
+        } else if (event.getType() === MEDIA_PREVIEW_ACCOUNT_DATA_TYPE) {
+            this.watchers.notifyUpdate("mediaPreviewConfig", roomId, SettingLevel.ROOM_ACCOUNT, event.getContent());
         }
     };
 
@@ -96,7 +98,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
 
         await this.client.setRoomAccountData(roomId, eventType, content);
 
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         const handler = (event: MatrixEvent, room: Room): void => {
             if (room.roomId !== roomId || event.getType() !== eventType) return;
             if (field !== null && event.getContent()[field] !== value) return;
@@ -108,7 +110,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
         await deferred.promise;
     }
 
-    public setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
+    public async setValue(settingName: string, roomId: string, newValue: any): Promise<void> {
         switch (settingName) {
             // Special case URL previews
             case "urlPreviewsEnabled":
@@ -117,7 +119,12 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
             // Special case allowed widgets
             case "allowedWidgets":
                 return this.setRoomAccountData(roomId, ALLOWED_WIDGETS_EVENT_TYPE, null, newValue);
-
+            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/handlers/RoomSettingsHandler.ts b/src/settings/handlers/RoomSettingsHandler.ts
index c574ea1ea4..a31ccb87e9 100644
--- a/src/settings/handlers/RoomSettingsHandler.ts
+++ b/src/settings/handlers/RoomSettingsHandler.ts
@@ -14,7 +14,6 @@ import {
     RoomStateEvent,
     type StateEvents,
 } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
 import { objectClone, objectKeyChanges } from "../../utils/objects";
@@ -98,7 +97,7 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
 
         const { event_id: eventId } = await this.client.sendStateEvent(roomId, eventType, content);
 
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         const handler = (event: MatrixEvent): void => {
             if (event.getId() !== eventId) return;
             this.client.off(RoomStateEvent.Events, handler);
diff --git a/src/slash-commands/utils.ts b/src/slash-commands/utils.ts
index f1be124151..d9cf15d16a 100644
--- a/src/slash-commands/utils.ts
+++ b/src/slash-commands/utils.ts
@@ -49,16 +49,14 @@ export const singleMxcUpload = async (cli: MatrixClient): Promise<string | null>
             const file = (ev as HTMLInputEvent).target.files?.[0];
             if (!file) return;
 
-            Modal.createDialog(UploadConfirmDialog, {
-                file,
-                onFinished: async (shouldContinue): Promise<void> => {
-                    if (shouldContinue) {
-                        const { content_uri: uri } = await cli.uploadContent(file);
-                        resolve(uri);
-                    } else {
-                        resolve(null);
-                    }
-                },
+            const { finished } = Modal.createDialog(UploadConfirmDialog, { file });
+            finished.then(async ([shouldContinue]) => {
+                if (shouldContinue) {
+                    const { content_uri: uri } = await cli.uploadContent(file);
+                    resolve(uri);
+                } else {
+                    resolve(null);
+                }
             });
         };
 
diff --git a/src/stores/ModalWidgetStore.ts b/src/stores/ModalWidgetStore.ts
index 10f16d24d2..2a2fbdd8da 100644
--- a/src/stores/ModalWidgetStore.ts
+++ b/src/stores/ModalWidgetStore.ts
@@ -61,18 +61,18 @@ export class ModalWidgetStore extends AsyncStoreWithClient<IState> {
                 widgetDefinition: { ...requestData },
                 widgetRoomId,
                 sourceWidgetId: sourceWidget.id,
-                onFinished: (success, data) => {
-                    this.closeModalWidget(sourceWidget, widgetRoomId, success && data ? data : { "m.exited": true });
-
-                    this.openSourceWidgetId = null;
-                    this.openSourceWidgetRoomId = null;
-                    this.modalInstance = null;
-                },
             },
             undefined,
             /* priority = */ false,
             /* static = */ true,
         );
+        this.modalInstance!.finished.then(([success, data]) => {
+            this.closeModalWidget(sourceWidget, widgetRoomId, success && data ? data : { "m.exited": true });
+
+            this.openSourceWidgetId = null;
+            this.openSourceWidgetRoomId = null;
+            this.modalInstance = null;
+        });
     };
 
     public closeModalWidget = (
diff --git a/src/stores/ReleaseAnnouncementStore.ts b/src/stores/ReleaseAnnouncementStore.ts
index 05362dde5a..0b287d44b9 100644
--- a/src/stores/ReleaseAnnouncementStore.ts
+++ b/src/stores/ReleaseAnnouncementStore.ts
@@ -17,7 +17,7 @@ import { Features } from "../settings/Settings";
 /**
  * The features are shown in the array order.
  */
-const FEATURES = ["threadsActivityCentre", "pinningMessageList"] as const;
+const FEATURES = ["pinningMessageList"] as const;
 /**
  * All the features that can be shown in the release announcements.
  */
diff --git a/src/stores/SetupEncryptionStore.ts b/src/stores/SetupEncryptionStore.ts
index 0bb7a53257..9e324b6496 100644
--- a/src/stores/SetupEncryptionStore.ts
+++ b/src/stores/SetupEncryptionStore.ts
@@ -29,7 +29,6 @@ export enum Phase {
     Done = 3, // final done stage, but still showing UX
     ConfirmSkip = 4,
     Finished = 5, // UX can be closed
-    ConfirmReset = 6,
 }
 
 /**
@@ -220,38 +219,6 @@ export class SetupEncryptionStore extends EventEmitter {
         this.emit("update");
     }
 
-    public reset(): void {
-        this.phase = Phase.ConfirmReset;
-        this.emit("update");
-    }
-
-    public async resetConfirm(): Promise<void> {
-        try {
-            // If we've gotten here, the user presumably lost their
-            // secret storage key if they had one. Start by resetting
-            // secret storage and setting up a new recovery key, then
-            // create new cross-signing keys once that succeeds.
-            await accessSecretStorage(
-                async (): Promise<void> => {
-                    this.phase = Phase.Finished;
-                },
-                {
-                    forceReset: true,
-                    resetCrossSigning: true,
-                },
-            );
-        } catch (e) {
-            logger.error("Error resetting cross-signing", e);
-            this.phase = Phase.Intro;
-        }
-        this.emit("update");
-    }
-
-    public returnAfterReset(): void {
-        this.phase = Phase.Intro;
-        this.emit("update");
-    }
-
     public done(): void {
         this.phase = Phase.Finished;
         this.emit("update");
diff --git a/src/stores/notifications/RoomNotificationState.ts b/src/stores/notifications/RoomNotificationState.ts
index 3447257e96..af873f712e 100644
--- a/src/stores/notifications/RoomNotificationState.ts
+++ b/src/stores/notifications/RoomNotificationState.ts
@@ -62,9 +62,9 @@ export class RoomNotificationState extends NotificationState implements IDestroy
     }
 
     /**
-     * True if the notification is an unset message.
+     * True if the notification is an unsent message.
      */
-    public get isUnsetMessage(): boolean {
+    public get isUnsentMessage(): boolean {
         return this.level === NotificationLevel.Unsent;
     }
 
diff --git a/src/stores/room-list-v3/RoomListStoreV3.ts b/src/stores/room-list-v3/RoomListStoreV3.ts
index 3d4af05e39..92de63285e 100644
--- a/src/stores/room-list-v3/RoomListStoreV3.ts
+++ b/src/stores/room-list-v3/RoomListStoreV3.ts
@@ -6,7 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
-import { EventType } from "matrix-js-sdk/src/matrix";
+import { EventType, KnownMembership } from "matrix-js-sdk/src/matrix";
 
 import type { EmptyObject, Room, RoomState } from "matrix-js-sdk/src/matrix";
 import type { MatrixDispatcher } from "../../dispatcher/dispatcher";
@@ -16,7 +16,6 @@ import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
 import SettingsStore from "../../settings/SettingsStore";
 import { VisibilityProvider } from "../room-list/filters/VisibilityProvider";
 import defaultDispatcher from "../../dispatcher/dispatcher";
-import { LISTS_UPDATE_EVENT } from "../room-list/RoomListStore";
 import { RoomSkipList } from "./skip-list/RoomSkipList";
 import { RecencySorter } from "./skip-list/sorters/RecencySorter";
 import { AlphabeticSorter } from "./skip-list/sorters/AlphabeticSorter";
@@ -34,6 +33,8 @@ import { LowPriorityFilter } from "./skip-list/filters/LowPriorityFilter";
 import { type Sorter, SortingAlgorithm } from "./skip-list/sorters";
 import { SettingLevel } from "../../settings/SettingLevel";
 import { MARKED_UNREAD_TYPE_STABLE, MARKED_UNREAD_TYPE_UNSTABLE } from "../../utils/notifications";
+import { getChangedOverrideRoomMutePushRules } from "../room-list/utils/roomMute";
+import { Action } from "../../dispatcher/actions";
 
 /**
  * These are the filters passed to the room skip list.
@@ -48,6 +49,15 @@ const FILTERS = [
     new LowPriorityFilter(),
 ];
 
+export enum RoomListStoreV3Event {
+    // The event/channel which is called when the room lists have been changed.
+    ListsUpdate = "lists_update",
+    // The event which is called when the room list is loaded.
+    ListsLoaded = "lists_loaded",
+}
+
+export const LISTS_UPDATE_EVENT = RoomListStoreV3Event.ListsUpdate;
+export const LISTS_LOADED_EVENT = RoomListStoreV3Event.ListsLoaded;
 /**
  * This store allows for fast retrieval of the room list in a sorted and filtered manner.
  * This is the third such implementation hence the "V3".
@@ -75,6 +85,13 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
         return rooms;
     }
 
+    /**
+     * Check whether the initial list of rooms has loaded.
+     */
+    public get isLoadingRooms(): boolean {
+        return !this.roomSkipList?.initialized;
+    }
+
     /**
      * Get a list of sorted rooms.
      */
@@ -126,6 +143,7 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
         await SpaceStore.instance.storeReadyPromise;
         const rooms = this.getRooms();
         this.roomSkipList.seed(rooms);
+        this.emit(LISTS_LOADED_EVENT);
         this.emit(LISTS_UPDATE_EVENT);
     }
 
@@ -179,22 +197,7 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
             }
 
             case "MatrixActions.accountData": {
-                if (payload.event_type !== EventType.Direct) return;
-                const dmMap = payload.event.getContent();
-                let needsEmit = false;
-                for (const userId of Object.keys(dmMap)) {
-                    const roomIds = dmMap[userId];
-                    for (const roomId of roomIds) {
-                        const room = this.matrixClient.getRoom(roomId);
-                        if (!room) {
-                            logger.warn(`${roomId} was found in DMs but the room is not in the store`);
-                            continue;
-                        }
-                        this.roomSkipList.addRoom(room);
-                        needsEmit = true;
-                    }
-                }
-                if (needsEmit) this.emit(LISTS_UPDATE_EVENT);
+                this.handleAccountDataPayload(payload);
                 break;
             }
 
@@ -208,14 +211,29 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
             case "MatrixActions.Room.myMembership": {
                 const oldMembership = getEffectiveMembership(payload.oldMembership);
                 const newMembership = getEffectiveMembershipTag(payload.room, payload.membership);
-                if (oldMembership === EffectiveMembership.Join && newMembership === EffectiveMembership.Leave) {
+
+                // If the user is kicked, re-insert the room and do nothing more.
+                const ownUserId = this.matrixClient.getSafeUserId();
+                const isKicked = (payload.room as Room).getMember(ownUserId)?.isKicked();
+                if (isKicked) {
+                    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
+                ) {
                     this.roomSkipList.removeRoom(payload.room);
                     this.emit(LISTS_UPDATE_EVENT);
                     return;
                 }
+
+                // 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) {
-                    // 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 = payload.room.currentState;
                     const predecessor = roomState.findPredecessor(this.msc3946ProcessDynamicPredecessor);
                     if (predecessor) {
@@ -224,12 +242,61 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
                         else logger.warn(`Unable to find predecessor room with id ${predecessor.roomId}`);
                     }
                 }
-                this.addRoomAndEmit(payload.room);
+
+                this.addRoomAndEmit(payload.room, true);
+                break;
+            }
+
+            case Action.AfterForgetRoom: {
+                const room = payload.room;
+                this.roomSkipList.removeRoom(room);
+                this.emit(LISTS_UPDATE_EVENT);
                 break;
             }
         }
     }
 
+    /**
+     * This method deals with the two types of account data payloads that we care about.
+     */
+    private handleAccountDataPayload(payload: ActionPayload): void {
+        const eventType = payload.event_type;
+        let needsEmit = false;
+        switch (eventType) {
+            // When we're told about new DMs, insert the associated dm rooms.
+            case EventType.Direct: {
+                const dmMap = payload.event.getContent();
+                for (const userId of Object.keys(dmMap)) {
+                    const roomIds = dmMap[userId];
+                    for (const roomId of roomIds) {
+                        const room = this.matrixClient!.getRoom(roomId);
+                        if (!room) {
+                            logger.warn(`${roomId} was found in DMs but the room is not in the store`);
+                            continue;
+                        }
+                        this.roomSkipList!.reInsertRoom(room);
+                        needsEmit = true;
+                    }
+                }
+                break;
+            }
+            case EventType.PushRules: {
+                // When a room becomes muted/unmuted, re-insert that room.
+                const possibleMuteChangeRoomIds = getChangedOverrideRoomMutePushRules(payload);
+                if (!possibleMuteChangeRoomIds) return;
+                const rooms = possibleMuteChangeRoomIds
+                    .map((id) => this.matrixClient?.getRoom(id))
+                    .filter((room) => !!room);
+                for (const room of rooms) {
+                    this.roomSkipList!.reInsertRoom(room);
+                    needsEmit = true;
+                }
+                break;
+            }
+        }
+        if (needsEmit) this.emit(LISTS_UPDATE_EVENT);
+    }
+
     /**
      * Create the correct sorter depending on the persisted user preference.
      * @param myUserId The user-id of our user.
@@ -250,10 +317,21 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
     /**
      * Add a room to the skiplist and emit an update.
      * @param room The room to add to the skiplist
+     * @param isNewRoom Set this to true if this a new room that the isn't already in the skiplist
      */
-    private addRoomAndEmit(room: Room): void {
+    private addRoomAndEmit(room: Room, isNewRoom = false): void {
         if (!this.roomSkipList) throw new Error("roomSkipList hasn't been created yet!");
-        this.roomSkipList.addRoom(room);
+        if (isNewRoom) {
+            if (!VisibilityProvider.instance.isRoomVisible(room)) {
+                logger.info(
+                    `RoomListStoreV3: Refusing to add new room ${room.roomId} because isRoomVisible returned false.`,
+                );
+                return;
+            }
+            this.roomSkipList.addNewRoom(room);
+        } else {
+            this.roomSkipList.reInsertRoom(room);
+        }
         this.emit(LISTS_UPDATE_EVENT);
     }
 
diff --git a/src/stores/room-list-v3/skip-list/RoomSkipList.ts b/src/stores/room-list-v3/skip-list/RoomSkipList.ts
index 5de15eaa46..93c898ee21 100644
--- a/src/stores/room-list-v3/skip-list/RoomSkipList.ts
+++ b/src/stores/room-list-v3/skip-list/RoomSkipList.ts
@@ -90,15 +90,34 @@ export class RoomSkipList implements Iterable<Room> {
     }
 
     /**
-     * Adds a given room to the correct sorted position in the list.
-     * If the room is already present in the list, it is first removed.
+     * Re-inserts a room that is already in the skiplist.
+     * This method does nothing if the room isn't already in the skiplist.
+     * @param room the room to add
      */
-    public addRoom(room: Room): void {
-        /**
-         * Remove this room from the skip list if necessary.
-         */
+    public reInsertRoom(room: Room): void {
+        if (!this.roomNodeMap.has(room.roomId)) {
+            return;
+        }
         this.removeRoom(room);
+        this.addNewRoom(room);
+    }
 
+    /**
+     * Adds a new room to the skiplist.
+     * This method will throw an error if the room is already in the skiplist.
+     * @param room the room to add
+     */
+    public addNewRoom(room: Room): void {
+        if (this.roomNodeMap.has(room.roomId)) {
+            throw new Error(`Can't add room to skiplist: ${room.roomId} is already in the skiplist!`);
+        }
+        this.insertRoom(room);
+    }
+
+    /**
+     * Adds a given room to the correct sorted position in the list.
+     */
+    private insertRoom(room: Room): void {
         const newNode = new RoomNode(room);
         newNode.checkIfRoomBelongsToActiveSpace();
         newNode.applyFilters(this.filters);
diff --git a/src/stores/room-list-v3/skip-list/filters/MentionsFilter.ts b/src/stores/room-list-v3/skip-list/filters/MentionsFilter.ts
index 8897e766d4..fb6e45b922 100644
--- a/src/stores/room-list-v3/skip-list/filters/MentionsFilter.ts
+++ b/src/stores/room-list-v3/skip-list/filters/MentionsFilter.ts
@@ -11,7 +11,7 @@ import { RoomNotificationStateStore } from "../../../notifications/RoomNotificat
 
 export class MentionsFilter implements Filter {
     public matches(room: Room): boolean {
-        return RoomNotificationStateStore.instance.getRoomState(room).hasMentions;
+        return RoomNotificationStateStore.instance.getRoomState(room).isMention;
     }
 
     public get key(): FilterKey.MentionsFilter {
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 38eb9a298b..53e8ae4331 100644
--- a/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts
+++ b/src/stores/room-list-v3/skip-list/sorters/RecencySorter.ts
@@ -8,6 +8,8 @@ Please see LICENSE files in the repository root for full details.
 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) {}
@@ -18,6 +20,11 @@ export class RecencySorter implements Sorter {
     }
 
     public comparator(roomA: Room, roomB: Room, cache?: any): number {
+        // 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);
         const roomBLastTs = this.getTs(roomB, cache);
         return roomBLastTs - roomALastTs;
@@ -27,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/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
index 6985e007bd..2fc396b8b3 100644
--- a/src/stores/room-list/RoomListStore.ts
+++ b/src/stores/room-list/RoomListStore.ts
@@ -7,7 +7,6 @@ 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 { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import SettingsStore from "../../settings/SettingsStore";
@@ -349,15 +348,6 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
     }
 
     private async handleRoomUpdate(room: Room, cause: RoomUpdateCause): Promise<any> {
-        if (cause === RoomUpdateCause.NewRoom && room.getMyMembership() === KnownMembership.Invite) {
-            // Let the visibility provider know that there is a new invited room. It would be nice
-            // if this could just be an event that things listen for but the point of this is that
-            // we delay doing anything about this room until the VoipUserMapper had had a chance
-            // to do the things it needs to do to decide if we should show this room or not, so
-            // an even wouldn't et us do that.
-            await VisibilityProvider.instance.onNewInvitedRoom(room);
-        }
-
         if (!VisibilityProvider.instance.isRoomVisible(room)) {
             return; // don't do anything on rooms that aren't visible
         }
diff --git a/src/stores/room-list/filters/VisibilityProvider.ts b/src/stores/room-list/filters/VisibilityProvider.ts
index f6b0acb030..178a1ed553 100644
--- a/src/stores/room-list/filters/VisibilityProvider.ts
+++ b/src/stores/room-list/filters/VisibilityProvider.ts
@@ -8,10 +8,8 @@
 
 import { type Room } from "matrix-js-sdk/src/matrix";
 
-import LegacyCallHandler from "../../../LegacyCallHandler";
 import { RoomListCustomisations } from "../../../customisations/RoomList";
 import { isLocalRoom } from "../../../utils/localRoom/isLocalRoom";
-import VoipUserMapper from "../../../VoipUserMapper";
 
 export class VisibilityProvider {
     private static internalInstance: VisibilityProvider;
@@ -25,22 +23,11 @@ export class VisibilityProvider {
         return VisibilityProvider.internalInstance;
     }
 
-    public async onNewInvitedRoom(room: Room): Promise<void> {
-        await VoipUserMapper.sharedInstance().onNewInvitedRoom(room);
-    }
-
     public isRoomVisible(room?: Room): boolean {
         if (!room) {
             return false;
         }
 
-        if (
-            LegacyCallHandler.instance.getSupportsVirtualRooms() &&
-            VoipUserMapper.sharedInstance().isVirtualRoom(room)
-        ) {
-            return false;
-        }
-
         // hide space rooms as they'll be shown in the SpacePanel
         if (room.isSpaceRoom()) {
             return false;
diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
index 690beaa0b7..015c9fa0fd 100644
--- a/src/stores/spaces/SpaceStore.ts
+++ b/src/stores/spaces/SpaceStore.ts
@@ -21,7 +21,6 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { logger } from "matrix-js-sdk/src/logger";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -153,7 +152,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
     private _enabledMetaSpaces: MetaSpace[] = [];
     /** Whether the feature flag is set for MSC3946 */
     private _msc3946ProcessDynamicPredecessor: boolean = SettingsStore.getValue("feature_dynamic_room_predecessors");
-    private _storeReadyDeferred = defer();
+    private _storeReadyDeferred = Promise.withResolvers<void>();
 
     public constructor() {
         super(defaultDispatcher, {});
@@ -270,7 +269,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
 
         if (contextSwitch) {
             // view last selected room from space
-            const roomId = window.localStorage.getItem(getSpaceContextKey(space));
+            const roomId = this.getLastSelectedRoomIdForSpace(space);
 
             // if the space being selected is an invite then always view that invite
             // else if the last viewed room in this space is joined then view that
@@ -320,6 +319,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
         }
     }
 
+    /**
+     * Returns the room-id of the last active room in a given space.
+     * This is the room that would be opened when you switch to a given space.
+     * @param space The space you're interested in.
+     * @returns room-id of the room or null if there's no last active room.
+     */
+    public getLastSelectedRoomIdForSpace(space: SpaceKey): string | null {
+        const roomId = window.localStorage.getItem(getSpaceContextKey(space));
+        return roomId;
+    }
+
     private async loadSuggestedRooms(space: Room): Promise<void> {
         const suggestedRooms = await this.fetchSuggestedRooms(space);
         if (this._activeSpace === space.roomId) {
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 31d1d6edac..d4c0f8930c 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -498,9 +498,9 @@ export class StopGapWidgetDriver extends WidgetDriver {
             if (results.length >= limit) break;
             if (since !== undefined && ev.getId() === since) break;
 
-            if (ev.getType() !== eventType || ev.isState()) continue;
+            if (ev.getType() !== eventType) continue;
             if (eventType === EventType.RoomMessage && msgtype && msgtype !== ev.getContent()["msgtype"]) continue;
-            if (ev.getStateKey() !== undefined && stateKey !== undefined && ev.getStateKey() !== stateKey) continue;
+            if (stateKey !== undefined && ev.getStateKey() !== stateKey) continue;
             results.push(ev);
         }
 
@@ -557,19 +557,17 @@ export class StopGapWidgetDriver extends WidgetDriver {
 
         observer.update({ state: OpenIDRequestState.PendingUserConfirmation });
 
-        Modal.createDialog(WidgetOpenIDPermissionsDialog, {
+        const { finished } = Modal.createDialog(WidgetOpenIDPermissionsDialog, {
             widget: this.forWidget,
             widgetKind: this.forWidgetKind,
             inRoomId: this.inRoomId,
-
-            onFinished: async (confirm): Promise<void> => {
-                if (!confirm) {
-                    return observer.update({ state: OpenIDRequestState.Blocked });
-                }
-
-                return observer.update({ state: OpenIDRequestState.Allowed, token: await getToken() });
-            },
         });
+        const [confirm] = await finished;
+        if (!confirm) {
+            observer.update({ state: OpenIDRequestState.Blocked });
+        } else {
+            observer.update({ state: OpenIDRequestState.Allowed, token: await getToken() });
+        }
     }
 
     public async navigate(uri: string): Promise<void> {
diff --git a/src/theme.ts b/src/theme.ts
index de384021aa..bfc471544c 100644
--- a/src/theme.ts
+++ b/src/theme.ts
@@ -129,7 +129,7 @@ function clearCustomTheme(): void {
     // remove all css variables, we assume these are there because of the custom theme
     const inlineStyleProps = Object.values(document.body.style);
     for (const prop of inlineStyleProps) {
-        if (prop.startsWith("--")) {
+        if (typeof prop === "string" && prop.startsWith("--")) {
             document.body.style.removeProperty(prop);
         }
     }
@@ -206,16 +206,49 @@ function generateCustomCompoundCSS(theme: CompoundTheme): string {
     return `@layer compound.custom { :root, [class*="cpd-theme-"] { ${properties.join(" ")} } }`;
 }
 
+/**
+ * Normalizes the hex colour to 8 characters (including alpha)
+ * @param hexColor the hex colour to normalize
+ */
+function normalizeHexColour(hexColor: string): string {
+    switch (hexColor.length) {
+        case 4:
+        case 5:
+            // Short RGB or RGBA hex
+            return `#${hexColor
+                .slice(1)
+                .split("")
+                .map((c) => c + c)
+                .join("")}`;
+        case 7:
+            // Long RGB hex
+            return `${hexColor}ff`;
+        default:
+            return hexColor;
+    }
+}
+
+function setHexAlpha(normalizedHexColor: string, alpha: number): string {
+    return normalizeHexColour(normalizedHexColor).slice(0, 7) + Math.round(alpha).toString(16).padStart(2, "0");
+}
+
+function parseAlpha(normalizedHexColor: string): number {
+    return parseInt(normalizedHexColor.slice(7), 16);
+}
+
 function setCustomThemeVars(customTheme: CustomTheme): void {
     const { style } = document.body;
 
     function setCSSColorVariable(name: string, hexColor: string, doPct = true): void {
         style.setProperty(`--${name}`, hexColor);
+        const normalizedHexColor = normalizeHexColour(hexColor);
+        const baseAlpha = parseAlpha(normalizedHexColor);
+
         if (doPct) {
-            // uses #rrggbbaa to define the color with alpha values at 0%, 15% and 50%
-            style.setProperty(`--${name}-0pct`, hexColor + "00");
-            style.setProperty(`--${name}-15pct`, hexColor + "26");
-            style.setProperty(`--${name}-50pct`, hexColor + "7F");
+            // uses #rrggbbaa to define the color with alpha values at 0%, 15% and 50% (relative to base alpha channel)
+            style.setProperty(`--${name}-0pct`, setHexAlpha(normalizedHexColor, 0));
+            style.setProperty(`--${name}-15pct`, setHexAlpha(normalizedHexColor, baseAlpha * 0.15));
+            style.setProperty(`--${name}-50pct`, setHexAlpha(normalizedHexColor, baseAlpha * 0.5));
         }
     }
 
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index 63e0757520..351ccdf4b2 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -34,34 +34,36 @@ const onReject = (): void => {
 };
 
 const onLearnMoreNoOptIn = (): void => {
-    showAnalyticsLearnMoreDialog({
-        onFinished: (buttonClicked?: ButtonClicked) => {
-            if (buttonClicked === ButtonClicked.Primary) {
-                // user clicked "Enable"
-                onAccept();
-            }
-            // otherwise, the user either clicked "Cancel", or closed the dialog without making a choice,
-            // leave the toast open
-        },
+    const { finished } = showAnalyticsLearnMoreDialog({
         primaryButton: _t("action|enable"),
     });
+
+    finished.then(([buttonClicked]) => {
+        if (buttonClicked === ButtonClicked.Primary) {
+            // user clicked "Enable"
+            onAccept();
+        }
+        // otherwise, the user either clicked "Cancel", or closed the dialog without making a choice,
+        // leave the toast open
+    });
 };
 
 const onLearnMorePreviouslyOptedIn = (): void => {
-    showAnalyticsLearnMoreDialog({
-        onFinished: (buttonClicked?: ButtonClicked) => {
-            if (buttonClicked === ButtonClicked.Primary) {
-                // user clicked "That's fine"
-                onAccept();
-            } else if (buttonClicked === ButtonClicked.Cancel) {
-                // user clicked "Stop"
-                onReject();
-            }
-            // otherwise, the user closed the dialog without making a choice, leave the toast open
-        },
+    const { finished } = showAnalyticsLearnMoreDialog({
         primaryButton: _t("analytics|accept_button"),
         cancelButton: _t("action|stop"),
     });
+
+    finished.then(([buttonClicked]) => {
+        if (buttonClicked === ButtonClicked.Primary) {
+            // user clicked "That's fine"
+            onAccept();
+        } else if (buttonClicked === ButtonClicked.Cancel) {
+            // user clicked "Stop"
+            onReject();
+        }
+        // otherwise, the user closed the dialog without making a choice, leave the toast open
+    });
 };
 
 const TOAST_KEY = "analytics";
diff --git a/src/toasts/SetupEncryptionToast.ts b/src/toasts/SetupEncryptionToast.ts
index 1613c5b9c9..802da5b895 100644
--- a/src/toasts/SetupEncryptionToast.ts
+++ b/src/toasts/SetupEncryptionToast.ts
@@ -14,7 +14,7 @@ import Modal from "../Modal";
 import { _t } from "../languageHandler";
 import DeviceListener from "../DeviceListener";
 import SetupEncryptionDialog from "../components/views/dialogs/security/SetupEncryptionDialog";
-import { accessSecretStorage } from "../SecurityManager";
+import { AccessCancelledError, accessSecretStorage } from "../SecurityManager";
 import ToastStore from "../stores/ToastStore";
 import GenericToast from "../components/views/toasts/GenericToast";
 import { ModuleRunner } from "../modules/ModuleRunner";
@@ -24,6 +24,7 @@ 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";
 
@@ -37,6 +38,8 @@ const getTitle = (kind: Kind): string => {
             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");
     }
 };
 
@@ -49,6 +52,8 @@ const getIcon = (kind: Kind): string | 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";
     }
 };
 
@@ -62,6 +67,8 @@ const getSetupCaption = (kind: Kind): string => {
             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");
     }
 };
 
@@ -87,6 +94,8 @@ const getSecondaryButtonLabel = (kind: Kind): string => {
             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");
     }
 };
 
@@ -100,6 +109,8 @@ const getDescription = (kind: Kind): string => {
             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");
     }
 };
 
@@ -123,6 +134,10 @@ export enum Kind {
      * 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",
 }
 
 /**
@@ -143,6 +158,13 @@ export const showToast = (kind: Kind): void => {
     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,
@@ -153,26 +175,58 @@ export const showToast = (kind: Kind): void => {
             );
             try {
                 await accessSecretStorage();
+            } catch (error) {
+                onAccessSecretStorageFailed(error as Error);
             } finally {
                 modal.close();
             }
         }
     };
 
-    const onSecondaryClick = (): void => {
+    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: { showResetIdentity: true },
+                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),
diff --git a/src/toasts/UpdateToast.tsx b/src/toasts/UpdateToast.tsx
index 0abc95c066..4ced8144c1 100644
--- a/src/toasts/UpdateToast.tsx
+++ b/src/toasts/UpdateToast.tsx
@@ -32,27 +32,27 @@ export const showToast = (version: string, newVersion: string, releaseNotes?: st
     let acceptLabel = _t("update|see_changes_button");
     if (releaseNotes) {
         onAccept = () => {
-            Modal.createDialog(QuestionDialog, {
+            const { finished } = Modal.createDialog(QuestionDialog, {
                 title: _t("update|release_notes_toast_title"),
                 description: <pre>{releaseNotes}</pre>,
                 button: _t("action|update"),
-                onFinished: (update) => {
-                    if (update && PlatformPeg.get()) {
-                        PlatformPeg.get()!.installUpdate();
-                    }
-                },
+            });
+            finished.then(([update]) => {
+                if (update && PlatformPeg.get()) {
+                    PlatformPeg.get()!.installUpdate();
+                }
             });
         };
     } else if (checkVersion(version) && checkVersion(newVersion)) {
         onAccept = () => {
-            Modal.createDialog(ChangelogDialog, {
+            const { finished } = Modal.createDialog(ChangelogDialog, {
                 version,
                 newVersion,
-                onFinished: (update) => {
-                    if (update && PlatformPeg.get()) {
-                        PlatformPeg.get()!.installUpdate();
-                    }
-                },
+            });
+            finished.then(([update]) => {
+                if (update && PlatformPeg.get()) {
+                    PlatformPeg.get()!.installUpdate();
+                }
             });
         };
     } else {
diff --git a/src/utils/DialogOpener.ts b/src/utils/DialogOpener.ts
index 8304d6c2aa..9eadf63adf 100644
--- a/src/utils/DialogOpener.ts
+++ b/src/utils/DialogOpener.ts
@@ -119,7 +119,7 @@ export class DialogOpener {
                 break;
             case Action.OpenAddToExistingSpaceDialog: {
                 const space = payload.space;
-                Modal.createDialog(
+                const { finished } = Modal.createDialog(
                     AddExistingToSpaceDialog,
                     {
                         onCreateRoomClick: (ev: ButtonEvent) => {
@@ -128,14 +128,14 @@ export class DialogOpener {
                         },
                         onAddSubspaceClick: () => showAddExistingSubspace(space),
                         space,
-                        onFinished: (added: boolean) => {
-                            if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
-                                defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
-                            }
-                        },
                     },
                     "mx_AddExistingToSpaceDialog_wrapper",
                 );
+                finished.then(([added]) => {
+                    if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
+                        defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+                    }
+                });
                 break;
             }
         }
diff --git a/src/utils/FormattingUtils.ts b/src/utils/FormattingUtils.ts
index 7e8a1d52a5..051ef7a371 100644
--- a/src/utils/FormattingUtils.ts
+++ b/src/utils/FormattingUtils.ts
@@ -56,17 +56,6 @@ export function formatBytes(bytes: number, decimals = 2): string {
     return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
 }
 
-/**
- * format a key into groups of 4 characters, for easier visual inspection
- *
- * @param {string} key key to format
- *
- * @return {string}
- */
-export function formatCryptoKey(key: string): string {
-    return key.match(/.{1,4}/g)!.join(" ");
-}
-
 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 eed70bdf32..ab7c67d477 100644
--- a/src/utils/Image.ts
+++ b/src/utils/Image.ts
@@ -31,13 +31,13 @@ export async function blobIsAnimated(mimeType: string | undefined, blob: Blob):
         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
-            const arr = await blob.slice(0, 17).arrayBuffer();
+            const arr = await blob.slice(0, 21).arrayBuffer();
             if (
                 arrayBufferReadStr(arr, 0, 4) === "RIFF" &&
                 arrayBufferReadStr(arr, 8, 4) === "WEBP" &&
                 arrayBufferReadStr(arr, 12, 4) === "VP8X"
             ) {
-                const [flags] = arrayBufferRead(arr, 16, 1);
+                const [flags] = arrayBufferRead(arr, 20, 1);
                 // Flags: R R I L E X _A_ R (reversed)
                 const animationFlagMask = 1 << 1;
                 return (flags & animationFlagMask) != 0;
diff --git a/src/utils/MultiInviter.ts b/src/utils/MultiInviter.ts
index 4f5bda879d..f8310de8bd 100644
--- a/src/utils/MultiInviter.ts
+++ b/src/utils/MultiInviter.ts
@@ -8,7 +8,6 @@ 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 { KnownMembership } from "matrix-js-sdk/src/types";
-import { defer, type IDeferred } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { AddressType, getAddressType } from "../UserAddress";
@@ -51,7 +50,7 @@ export default class MultiInviter {
     private _fatal = false;
     private completionStates: CompletionStates = {}; // State of each address (invited or error)
     private errors: Record<string, IError> = {}; // { address: {errorText, errcode} }
-    private deferred: IDeferred<CompletionStates> | null = null;
+    private deferred: PromiseWithResolvers<CompletionStates> | null = null;
     private reason: string | undefined;
 
     /**
@@ -93,7 +92,7 @@ export default class MultiInviter {
                 };
             }
         }
-        this.deferred = defer<CompletionStates>();
+        this.deferred = Promise.withResolvers<CompletionStates>();
         this.inviteMore(0);
 
         return this.deferred.promise;
diff --git a/src/utils/ReactUtils.tsx b/src/utils/ReactUtils.tsx
index a5a2aa9e0e..40217b1adb 100644
--- a/src/utils/ReactUtils.tsx
+++ b/src/utils/ReactUtils.tsx
@@ -9,15 +9,20 @@ Please see LICENSE files in the repository root for full details.
 import React, { type JSX, type ReactNode } from "react";
 
 /**
- * Joins an array into one value with a joiner. E.g. join(["hello", "world"], " ") -> <span>hello world</span>
+ * Joins an array into one value with a joiner. E.g. join(["hello", "world"], " ") -> <>hello world</>
  * @param array the array of element to join
  * @param joiner the string/JSX.Element to join with
  * @returns the joined array
  */
 export function jsxJoin(array: ReactNode[], joiner?: string | JSX.Element): JSX.Element {
-    const newArray: ReactNode[] = [];
-    array.forEach((element, index) => {
-        newArray.push(element, index === array.length - 1 ? null : joiner);
-    });
-    return <span>{newArray}</span>;
+    return (
+        <>
+            {array.map((element, index) => (
+                <React.Fragment key={index}>
+                    {element}
+                    {index === array.length - 1 ? null : joiner}
+                </React.Fragment>
+            ))}
+        </>
+    );
 }
diff --git a/src/utils/StorageManager.ts b/src/utils/StorageManager.ts
index 3b63f0a636..478d30af6f 100644
--- a/src/utils/StorageManager.ts
+++ b/src/utils/StorageManager.ts
@@ -92,8 +92,7 @@ export async function checkConsistency(): Promise<{
     if (dataInLocalStorage && cryptoInited && !dataInCryptoStore) {
         healthy = false;
         error(
-            "Data exists in local storage and crypto is marked as initialised " +
-                " but no data found in crypto store. " +
+            "Data exists in local storage and crypto is marked as initialised but no data found in crypto store. " +
                 "IndexedDB storage has likely been evicted by the browser!",
         );
     }
diff --git a/src/utils/Timer.ts b/src/utils/Timer.ts
index 6b120fa30a..c5d9084c31 100644
--- a/src/utils/Timer.ts
+++ b/src/utils/Timer.ts
@@ -6,8 +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 IDeferred, defer } from "matrix-js-sdk/src/utils";
-
 /**
 A countdown timer, exposing a promise api.
 A timer starts in a non-started state,
@@ -22,7 +20,7 @@ a new one through `clone()` or `cloneIfRun()`.
 export default class Timer {
     private timerHandle?: number;
     private startTs?: number;
-    private deferred!: IDeferred<void>;
+    private deferred!: PromiseWithResolvers<void>;
 
     public constructor(private timeout: number) {
         this.setNotStarted();
@@ -31,7 +29,7 @@ export default class Timer {
     private setNotStarted(): void {
         this.timerHandle = undefined;
         this.startTs = undefined;
-        this.deferred = defer();
+        this.deferred = Promise.withResolvers();
         this.deferred.promise = this.deferred.promise.finally(() => {
             this.timerHandle = undefined;
         });
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 6a75e8b222..c20ea8762f 100644
--- a/src/utils/exportUtils/HtmlExport.tsx
+++ b/src/utils/exportUtils/HtmlExport.tsx
@@ -13,7 +13,6 @@ import { renderToStaticMarkup } from "react-dom/server";
 import { logger } from "matrix-js-sdk/src/logger";
 import escapeHtml from "escape-html";
 import { TooltipProvider } from "@vector-im/compound-web";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import Exporter from "./Exporter";
 import { mediaFromMxc } from "../../customisations/Media";
@@ -302,7 +301,7 @@ export default class HTMLExporter extends Exporter {
         if (hasAvatar) await this.saveAvatarIfNeeded(mxEv);
         // We have to wait for the component to be rendered before we can get the markup
         // so pass a deferred as a ref to the component.
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         const EventTile = this.getEventTile(mxEv, continuation, deferred.resolve);
         let eventTileMarkup: string;
 
diff --git a/src/utils/leave-behaviour.ts b/src/utils/leave-behaviour.ts
index ec24903ad4..2ad6e7d4fe 100644
--- a/src/utils/leave-behaviour.ts
+++ b/src/utils/leave-behaviour.ts
@@ -171,20 +171,20 @@ export async function leaveRoomBehaviour(
 }
 
 export const leaveSpace = (space: Room): void => {
-    Modal.createDialog(
+    const { finished } = Modal.createDialog(
         LeaveSpaceDialog,
         {
             space,
-            onFinished: async (leave: boolean, rooms: Room[]): Promise<void> => {
-                if (!leave) return;
-                await bulkSpaceBehaviour(space, rooms, (room) => leaveRoomBehaviour(space.client, room.roomId));
-
-                dis.dispatch<AfterLeaveRoomPayload>({
-                    action: Action.AfterLeaveRoom,
-                    room_id: space.roomId,
-                });
-            },
         },
         "mx_LeaveSpaceDialog_wrapper",
     );
+    finished.then(async ([leave, rooms]) => {
+        if (!leave) return;
+        await bulkSpaceBehaviour(space, rooms!, (room) => leaveRoomBehaviour(space.client, room.roomId));
+
+        dis.dispatch<AfterLeaveRoomPayload>({
+            action: Action.AfterLeaveRoom,
+            room_id: space.roomId,
+        });
+    });
 };
diff --git a/src/utils/space.tsx b/src/utils/space.tsx
index 1a9b104c4b..230c783322 100644
--- a/src/utils/space.tsx
+++ b/src/utils/space.tsx
@@ -75,7 +75,7 @@ export const showCreateNewRoom = async (space: Room, type?: RoomType): Promise<b
     });
     const [shouldCreate, opts] = await modal.finished;
     if (shouldCreate) {
-        await createRoom(space.client, opts);
+        await createRoom(space.client, opts!);
     }
     return !!shouldCreate;
 };
@@ -106,35 +106,35 @@ export const showSpaceInvite = (space: Room, initialText = ""): void => {
 };
 
 export const showAddExistingSubspace = (space: Room): void => {
-    Modal.createDialog(
+    const { finished } = Modal.createDialog(
         AddExistingSubspaceDialog,
         {
             space,
             onCreateSubspaceClick: () => showCreateNewSubspace(space),
-            onFinished: (added: boolean) => {
-                if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
-                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
-                }
-            },
         },
         "mx_AddExistingToSpaceDialog_wrapper",
     );
+    finished.then(([added]) => {
+        if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
+            defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+        }
+    });
 };
 
 export const showCreateNewSubspace = (space: Room): void => {
-    Modal.createDialog(
+    const { finished } = Modal.createDialog(
         CreateSubspaceDialog,
         {
             space,
             onAddExistingSpaceClick: () => showAddExistingSubspace(space),
-            onFinished: (added: boolean) => {
-                if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
-                    defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
-                }
-            },
         },
         "mx_CreateSubspaceDialog_wrapper",
     );
+    finished.then(([added]) => {
+        if (added && SdkContextClass.instance.roomViewStore.getRoomId() === space.roomId) {
+            defaultDispatcher.fire(Action.UpdateSpaceHierarchy);
+        }
+    });
 };
 
 export const bulkSpaceBehaviour = async (
diff --git a/src/vector/index.ts b/src/vector/index.ts
index af557c241b..943ed49c6a 100644
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -49,6 +49,8 @@ function checkBrowserFeatures(): boolean {
     window.Modernizr.addTest("promiseprototypefinally", () => typeof window.Promise?.prototype?.finally === "function");
     // ES2020: http://262.ecma-international.org/#sec-promise.allsettled
     window.Modernizr.addTest("promiseallsettled", () => typeof window.Promise?.allSettled === "function");
+    // ES2024: https://2ality.com/2024/05/proposal-promise-with-resolvers.html
+    window.Modernizr.addTest("promisewithresolvers", () => typeof window.Promise?.withResolvers === "function");
     // ES2018: https://262.ecma-international.org/9.0/#sec-get-regexp.prototype.dotAll
     window.Modernizr.addTest(
         "regexpdotall",
@@ -160,21 +162,18 @@ async function start(): Promise<void> {
         // now that the config is ready, try to persist logs
         const persistLogsPromise = setupLogStorage();
 
-        // Load modules & plugins before language to ensure any custom translations are respected, and any app
-        // startup functionality is run
-        const loadModulesPromise = loadModules();
-        await settled(loadModulesPromise);
-        const loadPluginsPromise = loadPlugins();
-        await settled(loadPluginsPromise);
-
         // Load language after loading config.json so that settingsDefaults.language can be applied
         const loadLanguagePromise = loadLanguage();
         // as quickly as we possibly can, set a default theme...
         const loadThemePromise = loadTheme();
-
         // await things settling so that any errors we have to render have features like i18n running
         await settled(loadThemePromise, loadLanguagePromise);
 
+        const loadModulesPromise = loadModules();
+        await settled(loadModulesPromise);
+        const loadPluginsPromise = loadPlugins();
+        await settled(loadPluginsPromise);
+
         let acceptBrowser = supportedBrowser;
         if (!acceptBrowser && window.localStorage) {
             acceptBrowser = Boolean(window.localStorage.getItem("mx_accepts_unsupported_browser"));
diff --git a/src/vector/init.tsx b/src/vector/init.tsx
index 1169a6df28..e481e34b97 100644
--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -75,7 +75,7 @@ export async function loadLanguage(): Promise<void> {
         langs = [prefLang];
     }
     try {
-        await languageHandler.setLanguage(langs);
+        await languageHandler.setLanguage(...langs);
         document.documentElement.setAttribute("lang", languageHandler.getCurrentLanguage());
     } catch (e) {
         logger.error("Unable to set language", e);
diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html
index 30e26c619d..d58842d6a6 100644
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -782,6 +782,8 @@
             <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>
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index 19fa455168..2bacbe337d 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -17,7 +17,6 @@ import {
     type OidcRegistrationClientMetadata,
 } from "matrix-js-sdk/src/matrix";
 import React from "react";
-import { secureRandomString } from "matrix-js-sdk/src/randomstring";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import BasePlatform, { UpdateCheckStatus, type UpdateStatus } from "../../BasePlatform";
@@ -53,8 +52,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")) {
@@ -74,13 +71,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 };
@@ -97,8 +87,12 @@ 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();
-    // this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile
-    private readonly ssoID: string = secureRandomString(32);
+    private readonly initialised: Promise<void>;
+    private readonly electron: Electron;
+    private protocol!: string;
+    private sessionId!: string;
+    private config!: IConfigOptions;
+    private supportedSettings?: Record<string, boolean>;
 
     public constructor() {
         super();
@@ -106,15 +100,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),
@@ -123,44 +117,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({
@@ -179,20 +173,37 @@ 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: "" });
         });
 
-        void this.ipc.call("startSSOFlow", this.ssoID);
-
         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);
+        }
+    }
+
+    private async initialise(): Promise<void> {
+        const { protocol, sessionId, config, supportedSettings } = await this.electron.initialise();
+        this.protocol = protocol;
+        this.sessionId = sessionId;
+        this.config = config;
+        this.supportedSettings = supportedSettings;
     }
 
     public async getConfig(): Promise<IConfigOptions | undefined> {
-        return this.ipc.call("getConfig");
+        await this.initialised;
+        return this.config;
     }
 
     private onBreadcrumbsUpdate = (): void => {
@@ -239,7 +250,7 @@ export default class ElectronPlatform extends BasePlatform {
         if (this.notificationCount === count) return;
         super.setNotificationCount(count);
 
-        window.electron!.send("setBadgeCount", count);
+        this.electron.send("setBadgeCount", count);
     }
 
     public supportsNotifications(): boolean {
@@ -279,7 +290,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 {
@@ -291,21 +302,16 @@ 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);
+        return this.electron.getSettingValue(settingName);
     }
 
     public setSettingValue(settingName: string, value: any): Promise<void> {
-        return this.ipc.call("setSettingValue", settingName, value);
+        return this.electron.setSettingValue(settingName, value);
     }
 
     public async canSelfUpdate(): Promise<boolean> {
@@ -315,14 +321,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 {
@@ -391,7 +397,7 @@ export default class ElectronPlatform extends BasePlatform {
     public getSSOCallbackUrl(fragmentAfterLogin?: string): URL {
         const url = super.getSSOCallbackUrl(fragmentAfterLogin);
         url.protocol = "element";
-        url.searchParams.set(SSO_ID_KEY, this.ssoID);
+        url.searchParams.set(SSO_ID_KEY, this.sessionId);
         return url;
     }
 
@@ -469,7 +475,7 @@ export default class ElectronPlatform extends BasePlatform {
     }
 
     public getOidcClientState(): string {
-        return `:${SSO_ID_KEY}:${this.ssoID}`;
+        return `:${SSO_ID_KEY}:${this.sessionId}`;
     }
 
     /**
@@ -477,9 +483,9 @@ export default class ElectronPlatform extends BasePlatform {
      */
     public getOidcCallbackUrl(): URL {
         const url = super.getOidcCallbackUrl();
-        url.protocol = "io.element.desktop";
+        url.protocol = this.protocol;
         // Trim the double slash into a single slash to comply with https://datatracker.ietf.org/doc/html/rfc8252#section-7.1
-        if (url.href.startsWith(`${url.protocol}://`)) {
+        if (url.href.startsWith(`${url.protocol}//`)) {
             url.href = url.href.replace("://", ":/");
         }
         return url;
diff --git a/src/vector/platform/IPCManager.ts b/src/vector/platform/IPCManager.ts
index eb0f411025..5a5bb9b0fb 100644
--- a/src/vector/platform/IPCManager.ts
+++ b/src/vector/platform/IPCManager.ts
@@ -5,19 +5,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 { defer, type IDeferred } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { type ElectronChannel } from "../../@types/global";
 
 interface IPCPayload {
     id?: number;
-    error?: string;
+    error?: string | { message: string };
     reply?: any;
 }
 
 export class IPCManager {
-    private pendingIpcCalls: { [ipcCallId: number]: IDeferred<any> } = {};
+    private pendingIpcCalls: { [ipcCallId: number]: PromiseWithResolvers<any> } = {};
     private nextIpcCallId = 0;
 
     public constructor(
@@ -33,7 +32,7 @@ export class IPCManager {
     public async call(name: string, ...args: any[]): Promise<any> {
         // TODO this should be moved into the preload.js file.
         const ipcCallId = ++this.nextIpcCallId;
-        const deferred = defer<any>();
+        const deferred = Promise.withResolvers<any>();
         this.pendingIpcCalls[ipcCallId] = deferred;
         // Maybe add a timeout to these? Probably not necessary.
         window.electron!.send(this.sendChannel, { id: ipcCallId, name, args });
@@ -54,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 316f479e73..46b6a61f83 100644
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -18,6 +18,10 @@ import { Action } from "../../dispatcher/actions";
 import { type CheckUpdatesPayload } from "../../dispatcher/payloads/CheckUpdatesPayload";
 import { parseQs } from "../url_utils";
 import { _t } from "../../languageHandler";
+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";
 
 const POKE_RATE_MS = 10 * 60 * 1000; // 10 min
 
@@ -32,32 +36,59 @@ function getNormalizedAppVersion(version: string): string {
 
 export default class WebPlatform extends BasePlatform {
     private static readonly VERSION = process.env.VERSION!; // baked in by Webpack
+    private readonly registerServiceWorkerPromise: Promise<void>;
 
     public constructor() {
         super();
 
         // Register the service worker in the background
-        this.tryRegisterServiceWorker().catch((e) => console.error("Error registering/updating service worker:", e));
+        this.registerServiceWorkerPromise = this.registerServiceWorker();
+        this.registerServiceWorkerPromise.catch((e) => {
+            console.error("Error registering/updating service worker:", e);
+        });
     }
 
-    private async tryRegisterServiceWorker(): Promise<void> {
-        if (!("serviceWorker" in navigator)) {
-            return; // not available on this platform - don't try to register the service worker
-        }
+    protected onAction(payload: ActionPayload): void {
+        super.onAction(payload);
 
+        switch (payload.action) {
+            case "client_started":
+                // Defer drawing the toast until the client is started as the lifecycle methods reset the ToastStore right before
+                this.registerServiceWorkerPromise.catch(this.handleServiceWorkerRegistrationError);
+                break;
+        }
+    }
+
+    private async registerServiceWorker(): Promise<void> {
         // sw.js is exported by webpack, sourced from `/src/serviceworker/index.ts`
         const registration = await navigator.serviceWorker.register("sw.js");
         if (!registration) {
-            // Registration didn't work for some reason - assume failed and ignore.
-            // This typically happens in Jest.
-            return;
+            throw new Error("Service worker registration failed");
         }
 
-        navigator.serviceWorker.addEventListener("message", this.onServiceWorkerPostMessage.bind(this));
+        navigator.serviceWorker.addEventListener("message", this.onServiceWorkerPostMessage);
         await registration.update();
     }
 
-    private onServiceWorkerPostMessage(event: MessageEvent): void {
+    private handleServiceWorkerRegistrationError = (): void => {
+        const key = "service_worker_error";
+        const brand = SdkConfig.get().brand;
+        ToastStore.sharedInstance().addOrReplaceToast({
+            key,
+            title: _t("service_worker_error|title"),
+            props: {
+                description: _t("service_worker_error|description", { brand }),
+                primaryLabel: _t("action|ok"),
+                onPrimaryClick: () => {
+                    ToastStore.sharedInstance().dismissToast(key);
+                },
+            },
+            component: GenericToast,
+            priority: 95,
+        });
+    };
+
+    private onServiceWorkerPostMessage = (event: MessageEvent): void => {
         try {
             if (event.data?.["type"] === "userinfo" && event.data?.["responseKey"]) {
                 const userId = localStorage.getItem("mx_user_id");
@@ -73,7 +104,7 @@ export default class WebPlatform extends BasePlatform {
         } catch (e) {
             console.error("Error responding to service worker: ", e);
         }
-    }
+    };
 
     public getHumanReadableName(): string {
         return "Web Platform"; // no translation required: only used for analytics
diff --git a/src/widgets/ManagedHybrid.ts b/src/widgets/ManagedHybrid.ts
index f89420ae2a..b1a67db4fb 100644
--- a/src/widgets/ManagedHybrid.ts
+++ b/src/widgets/ManagedHybrid.ts
@@ -10,7 +10,6 @@ import { type IWidget } from "matrix-widget-api";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type Room } from "matrix-js-sdk/src/matrix";
 
-import { MatrixClientPeg } from "../MatrixClientPeg";
 import { getCallBehaviourWellKnown } from "../utils/WellKnownUtils";
 import WidgetUtils from "../utils/WidgetUtils";
 import { type IStoredLayout, WidgetLayoutStore } from "../stores/widgets/WidgetLayoutStore";
@@ -37,7 +36,7 @@ function getWidgetBuildUrl(room: Room): string | undefined {
         return SdkConfig.get().widget_build_url;
     }
 
-    const wellKnown = getCallBehaviourWellKnown(MatrixClientPeg.safeGet());
+    const wellKnown = getCallBehaviourWellKnown(room.client);
     if (isDm && wellKnown?.ignore_dm) {
         return undefined;
     }
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/components/views/dialogs/security/ResetIdentityDialog-test.tsx b/test/components/views/dialogs/security/ResetIdentityDialog-test.tsx
new file mode 100644
index 0000000000..5de2a0a043
--- /dev/null
+++ b/test/components/views/dialogs/security/ResetIdentityDialog-test.tsx
@@ -0,0 +1,63 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2018-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, { act } from "react";
+import { render } from "jest-matrix-react";
+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";
+
+describe("ResetIdentityDialog", () => {
+    afterEach(() => {
+        jest.resetAllMocks();
+        jest.restoreAllMocks();
+    });
+
+    it("should call onReset and onFinished when we click Continue", async () => {
+        const client = mockClient();
+
+        const onFinished = jest.fn();
+        const onReset = jest.fn();
+        const dialog = render(<ResetIdentityDialog onFinished={onFinished} onReset={onReset} variant="compromised" />);
+
+        await act(async () => dialog.getByRole("button", { name: "Continue" }).click());
+
+        expect(onReset).toHaveBeenCalled();
+        expect(onFinished).toHaveBeenCalled();
+
+        expect(client.getCrypto()?.resetEncryption).toHaveBeenCalled();
+    });
+
+    it("should call onFinished when we click Cancel", async () => {
+        const client = mockClient();
+
+        const onFinished = jest.fn();
+        const onReset = jest.fn();
+        const dialog = render(<ResetIdentityDialog onFinished={onFinished} onReset={onReset} variant="compromised" />);
+
+        await act(async () => dialog.getByRole("button", { name: "Cancel" }).click());
+
+        expect(onFinished).toHaveBeenCalled();
+
+        expect(onReset).not.toHaveBeenCalled();
+        expect(client.getCrypto()?.resetEncryption).not.toHaveBeenCalled();
+    });
+});
+
+function mockClient(): Mocked<MatrixClient> {
+    const mockCrypto = {
+        resetEncryption: jest.fn().mockResolvedValue(null),
+    } as unknown as Mocked<CryptoApi>;
+
+    return getMockClientWithEventEmitter({
+        getCrypto: jest.fn().mockReturnValue(mockCrypto),
+    });
+}
diff --git a/test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx b/test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
new file mode 100644
index 0000000000..885366c4e2
--- /dev/null
+++ b/test/components/views/dialogs/security/SetupEncryptionDialog-test.tsx
@@ -0,0 +1,88 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2018-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, { act } from "react";
+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";
+
+describe("SetupEncryptionDialog", () => {
+    afterEach(() => {
+        jest.resetAllMocks();
+        jest.restoreAllMocks();
+    });
+
+    it("should launch a dialog when I say Proceed, then be finished when I reset", async () => {
+        mockClient();
+        const store = new SetupEncryptionStore();
+        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
+
+        // Given when you open the reset dialog we immediately reset
+        jest.spyOn(Modal, "createDialog").mockImplementation((_, props) => {
+            // Simulate doing the reset in the dialog
+            props?.onReset();
+
+            return {
+                close: jest.fn(),
+                finished: Promise.resolve([]),
+            };
+        });
+
+        // When we launch the dialog and set it ready to start
+        const onFinished = jest.fn();
+        render(<SetupEncryptionDialog onFinished={onFinished} />);
+        await act(async () => await store.fetchKeyInfo());
+        expect(store.phase).toBe(Phase.Intro);
+
+        // 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());
+
+        // Then the phase has been set to Finished
+        expect(store.phase).toBe(Phase.Finished);
+    });
+});
+
+function mockClient() {
+    const mockCrypto = {
+        getDeviceVerificationStatus: jest.fn().mockResolvedValue({
+            crossSigningVerified: false,
+        }),
+        getUserDeviceInfo: jest.fn().mockResolvedValue(new Map()),
+        isCrossSigningReady: jest.fn().mockResolvedValue(true),
+        isSecretStorageReady: jest.fn().mockResolvedValue(true),
+        userHasCrossSigningKeys: jest.fn(),
+        getActiveSessionBackupVersion: jest.fn(),
+        getCrossSigningStatus: jest.fn().mockReturnValue({
+            publicKeysOnDevice: true,
+            privateKeysInSecretStorage: true,
+            privateKeysCachedLocally: {
+                masterKey: true,
+                selfSigningKey: true,
+                userSigningKey: true,
+            },
+        }),
+        getSessionBackupPrivateKey: jest.fn(),
+        isEncryptionEnabledInRoom: jest.fn(),
+        getKeyBackupInfo: jest.fn().mockResolvedValue(null),
+        getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
+    } as unknown as Mocked<CryptoApi>;
+
+    const userId = "@user:server";
+
+    getMockClientWithEventEmitter({
+        getCrypto: jest.fn().mockReturnValue(mockCrypto),
+        getUserId: jest.fn().mockReturnValue(userId),
+        secretStorage: { isStored: jest.fn().mockReturnValue({}) },
+    });
+}
diff --git a/test/test-utils/client.ts b/test/test-utils/client.ts
index 40aacb748e..cdda7b7dea 100644
--- a/test/test-utils/client.ts
+++ b/test/test-utils/client.ts
@@ -153,7 +153,7 @@ export const mockClientMethodsCrypto = (): Partial<
 > => ({
     isKeyBackupKeyStored: jest.fn(),
     getCrossSigningCacheCallbacks: jest.fn().mockReturnValue({ getCrossSigningKeyCache: jest.fn() }),
-    secretStorage: { hasKey: jest.fn() },
+    secretStorage: { hasKey: jest.fn(), isStored: jest.fn().mockResolvedValue(null) },
     getCrypto: jest.fn().mockReturnValue({
         getUserDeviceInfo: jest.fn(),
         getCrossSigningStatus: jest.fn().mockResolvedValue({
diff --git a/test/test-utils/test-utils.ts b/test/test-utils/test-utils.ts
index 93453d4629..1c147023c2 100644
--- a/test/test-utils/test-utils.ts
+++ b/test/test-utils/test-utils.ts
@@ -99,6 +99,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(),
@@ -156,6 +157,7 @@ export function createTestClient(): MatrixClient {
             getSessionBackupPrivateKey: jest.fn().mockResolvedValue(null),
             isSecretStorageReady: jest.fn().mockResolvedValue(false),
             deleteKeyBackupVersion: jest.fn(),
+            crossSignDevice: jest.fn(),
         }),
 
         getPushActionsForEvent: jest.fn(),
@@ -164,6 +166,7 @@ export function createTestClient(): MatrixClient {
         getVisibleRooms: jest.fn().mockReturnValue([]),
         loginFlows: jest.fn(),
         on: eventEmitter.on.bind(eventEmitter),
+        once: eventEmitter.once.bind(eventEmitter),
         off: eventEmitter.off.bind(eventEmitter),
         removeListener: eventEmitter.removeListener.bind(eventEmitter),
         emit: eventEmitter.emit.bind(eventEmitter),
@@ -303,10 +306,14 @@ export function createTestClient(): MatrixClient {
         getLocalAliases: jest.fn().mockReturnValue([]),
         uploadDeviceSigningKeys: jest.fn(),
         isKeyBackupKeyStored: jest.fn().mockResolvedValue(null),
-
+        getIgnoredUsers: jest.fn().mockReturnValue([]),
+        setIgnoredUsers: jest.fn(),
+        reportRoom: jest.fn(),
         pushProcessor: {
             getPushRuleById: jest.fn(),
         },
+        search: jest.fn().mockResolvedValue({}),
+        processRoomEventsSearch: jest.fn().mockResolvedValue({ highlights: [], results: [] }),
     } as unknown as MatrixClient;
 
     client.reEmitter = new ReEmitter(client);
diff --git a/test/unit-tests/ContentMessages-test.ts b/test/unit-tests/ContentMessages-test.ts
index 2b08cd85e0..80b400568e 100644
--- a/test/unit-tests/ContentMessages-test.ts
+++ b/test/unit-tests/ContentMessages-test.ts
@@ -14,7 +14,6 @@ import {
     type UploadResponse,
 } from "matrix-js-sdk/src/matrix";
 import { type ImageInfo } from "matrix-js-sdk/src/types";
-import { defer } from "matrix-js-sdk/src/utils";
 import encrypt, { type IEncryptedFile } from "matrix-encrypt-attachment";
 
 import ContentMessages, { UploadCanceledError, uploadFile } from "../../src/ContentMessages";
@@ -338,7 +337,7 @@ describe("ContentMessages", () => {
 
     describe("cancelUpload", () => {
         it("should cancel in-flight upload", async () => {
-            const deferred = defer<UploadResponse>();
+            const deferred = Promise.withResolvers<UploadResponse>();
             mocked(client.uploadContent).mockReturnValue(deferred.promise);
             const file1 = new File([], "file1");
             const prom = contentMessages.sendContentToRoom(file1, roomId, undefined, client, undefined);
diff --git a/test/unit-tests/DeviceListener-test.ts b/test/unit-tests/DeviceListener-test.ts
index f58eccf586..62221d0665 100644
--- a/test/unit-tests/DeviceListener-test.ts
+++ b/test/unit-tests/DeviceListener-test.ts
@@ -24,7 +24,7 @@ import {
 } from "matrix-js-sdk/src/crypto-api";
 import { type CryptoSessionStateChange } from "@matrix-org/analytics-events/types/typescript/CryptoSessionStateChange";
 
-import DeviceListener from "../../src/DeviceListener";
+import DeviceListener, { BACKUP_DISABLED_ACCOUNT_DATA_KEY } from "../../src/DeviceListener";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import * as SetupEncryptionToast from "../../src/toasts/SetupEncryptionToast";
 import * as UnverifiedSessionToast from "../../src/toasts/UnverifiedSessionToast";
@@ -118,6 +118,7 @@ describe("DeviceListener", () => {
             getDeviceId: jest.fn().mockReturnValue(deviceId),
             setAccountData: jest.fn(),
             getAccountData: jest.fn(),
+            getAccountDataFromServer: jest.fn(),
             deleteAccountData: jest.fn(),
             getCrypto: jest.fn().mockReturnValue(mockCrypto),
             secretStorage: {
@@ -309,6 +310,8 @@ describe("DeviceListener", () => {
             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();
             });
@@ -377,6 +380,7 @@ describe("DeviceListener", () => {
 
                 it("hides the out-of-sync toast when one of the secrets is missing", async () => {
                     mockCrypto!.isSecretStorageReady.mockResolvedValue(true);
+                    mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
 
                     // First show the toast
                     mockCrypto!.getCrossSigningStatus.mockResolvedValue({
@@ -414,6 +418,7 @@ describe("DeviceListener", () => {
                 it("shows set up recovery toast when user has a key backup available", async () => {
                     // non falsy response
                     mockCrypto.getKeyBackupInfo.mockResolvedValue({} as unknown as KeyBackupInfo);
+                    mockCrypto.getActiveSessionBackupVersion.mockResolvedValue("1");
                     mockClient.secretStorage.getDefaultKeyId.mockResolvedValue(null);
 
                     await createAndStart();
@@ -444,8 +449,13 @@ describe("DeviceListener", () => {
 
             it("dispatches keybackup event when key backup is not enabled", async () => {
                 mockCrypto.getActiveSessionBackupVersion.mockResolvedValue(null);
+                mockClient.getAccountDataFromServer.mockImplementation((eventType) =>
+                    eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY ? ({ disabled: true } as any) : null,
+                );
                 await createAndStart();
-                expect(mockDispatcher.dispatch).toHaveBeenCalledWith({ action: Action.ReportKeyBackupNotEnabled });
+                expect(mockDispatcher.dispatch).toHaveBeenCalledWith({
+                    action: Action.ReportKeyBackupNotEnabled,
+                });
             });
 
             it("does not check key backup status again after check is complete", async () => {
@@ -461,6 +471,137 @@ describe("DeviceListener", () => {
             });
         });
 
+        it("sets backup_disabled account data when we call recordKeyBackupDisabled", async () => {
+            const instance = await createAndStart();
+            await instance.recordKeyBackupDisabled();
+
+            expect(mockClient.setAccountData).toHaveBeenCalledWith("m.org.matrix.custom.backup_disabled", {
+                disabled: true,
+            });
+        });
+
+        describe("when crypto is in use and set up", () => {
+            beforeEach(() => {
+                // Encryption is in use
+                mockClient.getRooms.mockReturnValue([{ roomId: "!room1" }, { roomId: "!room2" }] as unknown as Room[]);
+                jest.spyOn(mockClient.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
+
+                // The device is verified
+                mockCrypto.getDeviceVerificationStatus.mockResolvedValue(
+                    new DeviceVerificationStatus({ crossSigningVerified: true }),
+                );
+            });
+
+            describe("but key storage is off", () => {
+                beforeEach(() => {
+                    // There is no active key backup/storage
+                    mockCrypto.getActiveSessionBackupVersion.mockResolvedValue(null);
+                });
+
+                it("shows the 'Turn on key storage' toast if we never explicitly turned off key storage", async () => {
+                    // Given key backup is off but the account data saying we turned it off is not set
+                    // (m.org.matrix.custom.backup_disabled)
+                    mockClient.getAccountData.mockReturnValue(undefined);
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is displayed
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+
+                it("shows the 'Turn on key storage' toast if we turned on key storage", async () => {
+                    // Given key backup is off but the account data says we turned it on (this should not happen - the
+                    // account data should only be updated if we turn on key storage)
+                    mockClient.getAccountData.mockImplementation((eventType) =>
+                        eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY
+                            ? new MatrixEvent({ content: { disabled: false } })
+                            : undefined,
+                    );
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is displayed
+                    expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+
+                it("does not show the 'Turn on key storage' toast if we turned off key storage", async () => {
+                    // Given key backup is off but the account data saying we turned it off is set
+                    mockClient.getAccountDataFromServer.mockImplementation((eventType) =>
+                        eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY ? ({ disabled: true } as any) : null,
+                    );
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is not displayed
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+            });
+
+            describe("and key storage is on", () => {
+                beforeEach(() => {
+                    // There is an active key backup/storage
+                    mockCrypto.getActiveSessionBackupVersion.mockResolvedValue("1");
+                });
+
+                it("does not show the 'Turn on key storage' toast if we never explicitly turned off key storage", async () => {
+                    // Given key backup is on and the account data saying we turned it off is not set
+                    mockClient.getAccountData.mockReturnValue(undefined);
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is not displayed
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+
+                it("does not show the 'Turn on key storage' toast if we turned on key storage", async () => {
+                    // Given key backup is on and the account data says we turned it on
+                    mockClient.getAccountData.mockImplementation((eventType) =>
+                        eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY
+                            ? new MatrixEvent({ content: { disabled: false } })
+                            : undefined,
+                    );
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is not displayed
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+
+                it("does not show the 'Turn on key storage' toast if we turned off key storage", async () => {
+                    // Given key backup is on but the account data saying we turned it off is set (this should never
+                    // happen - it should only be set when we turn off key storage or dismiss the toast)
+                    mockClient.getAccountData.mockImplementation((eventType) =>
+                        eventType === BACKUP_DISABLED_ACCOUNT_DATA_KEY
+                            ? new MatrixEvent({ content: { disabled: true } })
+                            : undefined,
+                    );
+
+                    // When we launch the DeviceListener
+                    await createAndStart();
+
+                    // Then the toast is not displayed
+                    expect(SetupEncryptionToast.showToast).not.toHaveBeenCalledWith(
+                        SetupEncryptionToast.Kind.TURN_ON_KEY_STORAGE,
+                    );
+                });
+            });
+        });
+
         describe("unverified sessions toasts", () => {
             const currentDevice = new Device({ deviceId, userId: userId, algorithms: [], keys: new Map() });
             const device2 = new Device({ deviceId: "d2", userId: userId, algorithms: [], keys: new Map() });
@@ -995,6 +1136,8 @@ describe("DeviceListener", () => {
             });
 
             it("shows the 'set up recovery' toast if user has not set up 4S", async () => {
+                mockCrypto!.getActiveSessionBackupVersion.mockResolvedValue("1");
+
                 await createAndStart();
 
                 expect(SetupEncryptionToast.showToast).toHaveBeenCalledWith(SetupEncryptionToast.Kind.SET_UP_RECOVERY);
diff --git a/test/unit-tests/HtmlUtils-test.tsx b/test/unit-tests/HtmlUtils-test.tsx
index 0650db1890..97c8da6013 100644
--- a/test/unit-tests/HtmlUtils-test.tsx
+++ b/test/unit-tests/HtmlUtils-test.tsx
@@ -7,20 +7,14 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React from "react";
-import { mocked } from "jest-mock";
 import { render, screen } from "jest-matrix-react";
 import parse from "html-react-parser";
 
 import { bodyToHtml, bodyToNode, formatEmojis, topicToHtml } from "../../src/HtmlUtils";
 import SettingsStore from "../../src/settings/SettingsStore";
-
-jest.mock("../../src/settings/SettingsStore");
-
-const enableHtmlTopicFeature = () => {
-    mocked(SettingsStore).getValue.mockImplementation((arg): any => {
-        return arg === "feature_html_topic";
-    });
-};
+import { getMockClientWithEventEmitter } from "../test-utils";
+import { SettingLevel } from "../../src/settings/SettingLevel";
+import SdkConfig from "../../src/SdkConfig";
 
 describe("topicToHtml", () => {
     function getContent() {
@@ -38,19 +32,16 @@ describe("topicToHtml", () => {
     });
 
     it("converts literal HTML topic to HTML", async () => {
-        enableHtmlTopicFeature();
         render(<div role="contentinfo">{topicToHtml("<b>pizza</b>", undefined, null, false)}</div>);
         expect(getContent()).toEqual("&lt;b&gt;pizza&lt;/b&gt;");
     });
 
     it("converts true HTML topic to HTML", async () => {
-        enableHtmlTopicFeature();
         render(<div role="contentinfo">{topicToHtml("**pizza**", "<b>pizza</b>", null, false)}</div>);
         expect(getContent()).toEqual("<b>pizza</b>");
     });
 
     it("converts true HTML topic with emoji to HTML", async () => {
-        enableHtmlTopicFeature();
         render(<div role="contentinfo">{topicToHtml("**pizza** 🍕", "<b>pizza</b> 🍕", null, false)}</div>);
         expect(getContent()).toEqual('<b>pizza</b> <span class="mx_Emoji" title=":pizza:">🍕</span>');
     });
@@ -107,7 +98,12 @@ describe("bodyToHtml", () => {
 
     describe("feature_latex_maths", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => feature === "feature_latex_maths");
+            SettingsStore.setValue("feature_latex_maths", null, SettingLevel.DEVICE, true);
+        });
+
+        afterEach(() => {
+            SettingsStore.reset();
+            SdkConfig.reset();
         });
 
         it("should render inline katex", () => {
@@ -228,4 +224,39 @@ describe("bodyToNode", () => {
 
         expect(asFragment()).toMatchSnapshot();
     });
+
+    it.each([[true], [false]])("should handle inline media when mediaIsVisible is %s", (mediaIsVisible) => {
+        const cli = getMockClientWithEventEmitter({
+            mxcUrlToHttp: jest.fn().mockReturnValue("https://example.org/img"),
+        });
+        const { className, formattedBody } = bodyToNode(
+            {
+                "body": "![foo](mxc://going/knowwhere) Hello there",
+                "format": "org.matrix.custom.html",
+                "formatted_body": `<img src="mxc://going/knowwhere">foo</img> Hello there`,
+                "m.relates_to": {
+                    "m.in_reply_to": {
+                        event_id: "$eventId",
+                    },
+                },
+                "msgtype": "m.text",
+            },
+            [],
+            {
+                mediaIsVisible,
+            },
+        );
+
+        const { asFragment } = render(
+            <span className={className} dir="auto" dangerouslySetInnerHTML={{ __html: formattedBody! }} />,
+        );
+        expect(asFragment()).toMatchSnapshot();
+        // We do not want to download untrusted media.
+        // eslint-disable-next-line no-restricted-properties
+        expect(cli.mxcUrlToHttp).toHaveBeenCalledTimes(mediaIsVisible ? 1 : 0);
+    });
+
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
 });
diff --git a/test/unit-tests/Image-test.ts b/test/unit-tests/Image-test.ts
index 149ee0ff26..966236bc8a 100644
--- a/test/unit-tests/Image-test.ts
+++ b/test/unit-tests/Image-test.ts
@@ -51,6 +51,13 @@ describe("Image", () => {
             expect(await blobIsAnimated("image/webp", 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();
+        });
+
         it("Animated PNG", async () => {
             const img = new Blob([fs.readFileSync(path.resolve(__dirname, "images", "animated-logo.apng"))]);
             expect(await blobIsAnimated("image/png", img)).toBeTruthy();
diff --git a/test/unit-tests/LegacyCallHandler-test.ts b/test/unit-tests/LegacyCallHandler-test.ts
index 664e091393..972f17b7e0 100644
--- a/test/unit-tests/LegacyCallHandler-test.ts
+++ b/test/unit-tests/LegacyCallHandler-test.ts
@@ -29,8 +29,6 @@ import LegacyCallHandler, {
     LegacyCallHandlerEvent,
     PROTOCOL_PSTN,
     PROTOCOL_PSTN_PREFIXED,
-    PROTOCOL_SIP_NATIVE,
-    PROTOCOL_SIP_VIRTUAL,
 } from "../../src/LegacyCallHandler";
 import { mkStubRoom, stubClient, untilDispatch } from "../test-utils";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
@@ -75,9 +73,6 @@ const NATIVE_ALICE = "@alice:example.org";
 const NATIVE_BOB = "@bob:example.org";
 const NATIVE_CHARLIE = "@charlie:example.org";
 
-// Virtual user for Bob
-const VIRTUAL_BOB = "@virtual_bob:example.org";
-
 //const REAL_ROOM_ID = "$room1:example.org";
 // The rooms the user sees when they're communicating with these users
 const NATIVE_ROOM_ALICE = "$alice_room:example.org";
@@ -86,10 +81,6 @@ const NATIVE_ROOM_CHARLIE = "$charlie_room:example.org";
 
 const FUNCTIONAL_USER = "@bot:example.com";
 
-// The room we use to talk to virtual Bob (but that the user does not see)
-// Bob has a virtual room, but Alice doesn't
-const VIRTUAL_ROOM_BOB = "$virtual_bob_room:example.org";
-
 // Bob's phone number
 const BOB_PHONE_NUMBER = "01818118181";
 
@@ -146,14 +137,6 @@ class FakeCall extends EventEmitter {
     }
 }
 
-function untilCallHandlerEvent(callHandler: LegacyCallHandler, event: LegacyCallHandlerEvent): Promise<void> {
-    return new Promise<void>((resolve) => {
-        callHandler.addListener(event, () => {
-            resolve();
-        });
-    });
-}
-
 describe("LegacyCallHandler", () => {
     let dmRoomMap;
     let callHandler: LegacyCallHandler;
@@ -162,7 +145,6 @@ describe("LegacyCallHandler", () => {
 
     // what addresses the app has looked up via pstn and native lookup
     let pstnLookup: string | null;
-    let nativeLookup: string | null;
     const deviceId = "my-device";
 
     beforeEach(async () => {
@@ -180,8 +162,6 @@ describe("LegacyCallHandler", () => {
         MatrixClientPeg.safeGet().getThirdpartyProtocols = () => {
             return Promise.resolve({
                 "m.id.phone": {} as IProtocol,
-                "im.vector.protocol.sip_native": {} as IProtocol,
-                "im.vector.protocol.sip_virtual": {} as IProtocol,
             });
         };
 
@@ -193,7 +173,6 @@ describe("LegacyCallHandler", () => {
         const nativeRoomAlice = mkStubDM(NATIVE_ROOM_ALICE, NATIVE_ALICE);
         const nativeRoomBob = mkStubDM(NATIVE_ROOM_BOB, NATIVE_BOB);
         const nativeRoomCharie = mkStubDM(NATIVE_ROOM_CHARLIE, NATIVE_CHARLIE);
-        const virtualBobRoom = mkStubDM(VIRTUAL_ROOM_BOB, VIRTUAL_BOB);
 
         MatrixClientPeg.safeGet().getRoom = (roomId: string): Room | null => {
             switch (roomId) {
@@ -203,8 +182,6 @@ describe("LegacyCallHandler", () => {
                     return nativeRoomBob;
                 case NATIVE_ROOM_CHARLIE:
                     return nativeRoomCharie;
-                case VIRTUAL_ROOM_BOB:
-                    return virtualBobRoom;
             }
 
             return null;
@@ -218,8 +195,6 @@ describe("LegacyCallHandler", () => {
                     return NATIVE_BOB;
                 } else if (roomId === NATIVE_ROOM_CHARLIE) {
                     return NATIVE_CHARLIE;
-                } else if (roomId === VIRTUAL_ROOM_BOB) {
-                    return VIRTUAL_BOB;
                 } else {
                     return null;
                 }
@@ -231,8 +206,6 @@ describe("LegacyCallHandler", () => {
                     return [NATIVE_ROOM_BOB];
                 } else if (userId === NATIVE_CHARLIE) {
                     return [NATIVE_ROOM_CHARLIE];
-                } else if (userId === VIRTUAL_BOB) {
-                    return [VIRTUAL_ROOM_BOB];
                 } else {
                     return [];
                 }
@@ -241,52 +214,18 @@ describe("LegacyCallHandler", () => {
         DMRoomMap.setShared(dmRoomMap);
 
         pstnLookup = null;
-        nativeLookup = null;
 
         MatrixClientPeg.safeGet().getThirdpartyUser = (proto: string, params: any) => {
             if ([PROTOCOL_PSTN, PROTOCOL_PSTN_PREFIXED].includes(proto)) {
                 pstnLookup = params["m.id.phone"];
                 return Promise.resolve([
                     {
-                        userid: VIRTUAL_BOB,
+                        userid: NATIVE_BOB,
                         protocol: "m.id.phone",
-                        fields: {
-                            is_native: true,
-                            lookup_success: true,
-                        },
+                        fields: {},
                     },
                 ]);
-            } else if (proto === PROTOCOL_SIP_NATIVE) {
-                nativeLookup = params["virtual_mxid"];
-                if (params["virtual_mxid"] === VIRTUAL_BOB) {
-                    return Promise.resolve([
-                        {
-                            userid: NATIVE_BOB,
-                            protocol: "im.vector.protocol.sip_native",
-                            fields: {
-                                is_native: true,
-                                lookup_success: true,
-                            },
-                        },
-                    ]);
-                }
-                return Promise.resolve([]);
-            } else if (proto === PROTOCOL_SIP_VIRTUAL) {
-                if (params["native_mxid"] === NATIVE_BOB) {
-                    return Promise.resolve([
-                        {
-                            userid: VIRTUAL_BOB,
-                            protocol: "im.vector.protocol.sip_virtual",
-                            fields: {
-                                is_virtual: true,
-                                lookup_success: true,
-                            },
-                        },
-                    ]);
-                }
-                return Promise.resolve([]);
             }
-
             return Promise.resolve([]);
         };
 
@@ -312,16 +251,14 @@ describe("LegacyCallHandler", () => {
         await callHandler.dialNumber(BOB_PHONE_NUMBER);
 
         expect(pstnLookup).toEqual(BOB_PHONE_NUMBER);
-        expect(nativeLookup).toEqual(VIRTUAL_BOB);
 
         // we should have switched to the native room for Bob
         const viewRoomPayload = await untilDispatch(Action.ViewRoom);
         expect(viewRoomPayload.room_id).toEqual(NATIVE_ROOM_BOB);
 
         // Check that a call was started: its room on the protocol level
-        // should be the virtual room
         expect(fakeCall).not.toBeNull();
-        expect(fakeCall?.roomId).toEqual(VIRTUAL_ROOM_BOB);
+        expect(fakeCall?.roomId).toEqual(NATIVE_ROOM_BOB);
 
         // but it should appear to the user to be in thw native room for Bob
         expect(callHandler.roomIdForCall(fakeCall!)).toEqual(NATIVE_ROOM_BOB);
@@ -338,7 +275,7 @@ describe("LegacyCallHandler", () => {
         expect(viewRoomPayload.room_id).toEqual(NATIVE_ROOM_BOB);
 
         expect(fakeCall).not.toBeNull();
-        expect(fakeCall!.roomId).toEqual(VIRTUAL_ROOM_BOB);
+        expect(fakeCall!.roomId).toEqual(NATIVE_ROOM_BOB);
 
         expect(callHandler.roomIdForCall(fakeCall!)).toEqual(NATIVE_ROOM_BOB);
     });
@@ -346,8 +283,6 @@ describe("LegacyCallHandler", () => {
     it("should move calls between rooms when remote asserted identity changes", async () => {
         callHandler.placeCall(NATIVE_ROOM_ALICE, CallType.Voice);
 
-        await untilCallHandlerEvent(callHandler, LegacyCallHandlerEvent.CallState);
-
         // We placed the call in Alice's room so it should start off there
         expect(callHandler.getCallForRoom(NATIVE_ROOM_ALICE)).toBe(fakeCall);
 
@@ -517,10 +452,7 @@ describe("LegacyCallHandler without third party protocols", () => {
     it("should still start a native call", async () => {
         callHandler.placeCall(NATIVE_ROOM_ALICE, CallType.Voice);
 
-        await untilCallHandlerEvent(callHandler, LegacyCallHandlerEvent.CallState);
-
         // Check that a call was started: its room on the protocol level
-        // should be the virtual room
         expect(fakeCall).not.toBeNull();
         expect(fakeCall!.roomId).toEqual(NATIVE_ROOM_ALICE);
 
diff --git a/test/unit-tests/Lifecycle-test.ts b/test/unit-tests/Lifecycle-test.ts
index 62a93b6d38..97ab3c6109 100644
--- a/test/unit-tests/Lifecycle-test.ts
+++ b/test/unit-tests/Lifecycle-test.ts
@@ -38,6 +38,12 @@ const webCrypto = new Crypto();
 const windowCrypto = window.crypto;
 
 describe("Lifecycle", () => {
+    const homeserverUrl = "https://domain";
+    const identityServerUrl = "https://is.org";
+    const userId = "@alice:domain";
+    const deviceId = "abc123";
+    const accessToken = "test-access-token";
+
     let mockPlatform: MockedObject<BasePlatform>;
 
     const realLocalStorage = global.localStorage;
@@ -53,7 +59,7 @@ describe("Lifecycle", () => {
             removeAllListeners: jest.fn(),
             clearStores: jest.fn(),
             getAccountData: jest.fn(),
-            getDeviceId: jest.fn(),
+            getDeviceId: jest.fn().mockReturnValue(deviceId),
             isVersionSupported: jest.fn().mockResolvedValue(true),
             getCrypto: jest.fn(),
             getClientWellKnown: jest.fn(),
@@ -156,11 +162,6 @@ describe("Lifecycle", () => {
             });
     };
 
-    const homeserverUrl = "https://server.org";
-    const identityServerUrl = "https://is.org";
-    const userId = "@alice:server.org";
-    const deviceId = "abc123";
-    const accessToken = "test-access-token";
     const localStorageSession = {
         mx_hs_url: homeserverUrl,
         mx_is_url: identityServerUrl,
@@ -605,6 +606,38 @@ describe("Lifecycle", () => {
             expect(MatrixClientPeg.start).toHaveBeenCalled();
         });
 
+        describe("after a soft-logout", () => {
+            beforeEach(async () => {
+                await setLoggedIn(credentials);
+                localStorage.setItem("mx_soft_logout", "true");
+            });
+
+            it("should not clear the storage if device is the same", async () => {
+                await Lifecycle.hydrateSession(credentials);
+
+                expect(localStorage.removeItem).toHaveBeenCalledWith("mx_soft_logout");
+                expect(mockClient.getUserId).toHaveReturnedWith(userId);
+                expect(mockClient.getDeviceId).toHaveReturnedWith(deviceId);
+                expect(mockClient.clearStores).toHaveBeenCalledTimes(1);
+            });
+
+            it("should clear the storage if device is not the same", async () => {
+                const fakeCredentials = {
+                    homeserverUrl,
+                    identityServerUrl,
+                    userId: "@bob:domain",
+                    deviceId,
+                    accessToken,
+                };
+                await Lifecycle.hydrateSession(fakeCredentials);
+
+                expect(localStorage.removeItem).toHaveBeenCalledWith("mx_soft_logout");
+                expect(mockClient.getUserId).toHaveReturnedWith(userId);
+                expect(mockClient.getDeviceId).toHaveReturnedWith(deviceId);
+                expect(mockClient.clearStores).toHaveBeenCalledTimes(2);
+            });
+        });
+
         describe("without a pickle key", () => {
             beforeEach(() => {
                 jest.spyOn(mockPlatform, "createPickleKey").mockResolvedValue(null);
diff --git a/test/unit-tests/Modal-test.ts b/test/unit-tests/Modal-test.ts
index d542fa3843..121c027b01 100644
--- a/test/unit-tests/Modal-test.ts
+++ b/test/unit-tests/Modal-test.ts
@@ -9,6 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import Modal from "../../src/Modal";
 import QuestionDialog from "../../src/components/views/dialogs/QuestionDialog";
 import defaultDispatcher from "../../src/dispatcher/dispatcher";
+import { flushPromises } from "../test-utils";
 
 describe("Modal", () => {
     test("forceCloseAllModals should close all open modals", () => {
@@ -23,7 +24,7 @@ describe("Modal", () => {
         expect(Modal.hasDialogs()).toBe(false);
     });
 
-    test("open modals should be closed on logout", () => {
+    test("open modals should be closed on logout", async () => {
         const modal1OnFinished = jest.fn();
         const modal2OnFinished = jest.fn();
 
@@ -31,18 +32,18 @@ describe("Modal", () => {
             title: "Test dialog 1",
             description: "This is a test dialog",
             button: "Word",
-            onFinished: modal1OnFinished,
-        });
+        }).finished.then(modal1OnFinished);
 
         Modal.createDialog(QuestionDialog, {
             title: "Test dialog 2",
             description: "This is a test dialog",
             button: "Word",
-            onFinished: modal2OnFinished,
-        });
+        }).finished.then(modal2OnFinished);
 
         defaultDispatcher.dispatch({ action: "logout" }, true);
 
+        await flushPromises();
+
         expect(modal1OnFinished).toHaveBeenCalled();
         expect(modal2OnFinished).toHaveBeenCalled();
     });
diff --git a/test/unit-tests/Rooms-test.ts b/test/unit-tests/Rooms-test.ts
index a9266d7e79..841b6f3722 100644
--- a/test/unit-tests/Rooms-test.ts
+++ b/test/unit-tests/Rooms-test.ts
@@ -79,16 +79,6 @@ describe("setDMRoom", () => {
         });
     });
 
-    describe("when trying to add a DM, that already exists", () => {
-        beforeEach(() => {
-            setDMRoom(client, roomId1, userId1);
-        });
-
-        it("should not update the account data", () => {
-            expect(client.setAccountData).not.toHaveBeenCalled();
-        });
-    });
-
     describe("when removing an existing DM", () => {
         beforeEach(() => {
             setDMRoom(client, roomId1, null);
@@ -102,16 +92,6 @@ describe("setDMRoom", () => {
         });
     });
 
-    describe("when removing an unknown room", () => {
-        beforeEach(() => {
-            setDMRoom(client, roomId4, null);
-        });
-
-        it("should not update the account data", () => {
-            expect(client.setAccountData).not.toHaveBeenCalled();
-        });
-    });
-
     describe("when the direct event is undefined", () => {
         beforeEach(() => {
             mocked(client.getAccountData).mockReturnValue(undefined);
diff --git a/test/unit-tests/SlashCommands-test.tsx b/test/unit-tests/SlashCommands-test.tsx
index 60bc145892..375a8888b7 100644
--- a/test/unit-tests/SlashCommands-test.tsx
+++ b/test/unit-tests/SlashCommands-test.tsx
@@ -14,7 +14,6 @@ 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 LegacyCallHandler from "../../src/LegacyCallHandler";
 import { SdkContextClass } from "../../src/contexts/SDKContext";
 import Modal from "../../src/Modal";
 import WidgetUtils from "../../src/utils/WidgetUtils";
@@ -22,6 +21,7 @@ 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 ErrorDialog from "../../src/components/views/dialogs/ErrorDialog";
 
 jest.mock("../../src/components/views/right_panel/UserInfo");
 
@@ -196,46 +196,6 @@ describe("SlashCommands", () => {
         });
     });
 
-    describe("/tovirtual", () => {
-        beforeEach(() => {
-            command = findCommand("tovirtual")!;
-        });
-
-        describe("isEnabled", () => {
-            describe("when virtual rooms are supported", () => {
-                beforeEach(() => {
-                    jest.spyOn(LegacyCallHandler.instance, "getSupportsVirtualRooms").mockReturnValue(true);
-                });
-
-                it("should return true for Room", () => {
-                    setCurrentRoom();
-                    expect(command.isEnabled(client)).toBe(true);
-                });
-
-                it("should return false for LocalRoom", () => {
-                    setCurrentLocalRoom();
-                    expect(command.isEnabled(client)).toBe(false);
-                });
-            });
-
-            describe("when virtual rooms are not supported", () => {
-                beforeEach(() => {
-                    jest.spyOn(LegacyCallHandler.instance, "getSupportsVirtualRooms").mockReturnValue(false);
-                });
-
-                it("should return false for Room", () => {
-                    setCurrentRoom();
-                    expect(command.isEnabled(client)).toBe(false);
-                });
-
-                it("should return false for LocalRoom", () => {
-                    setCurrentLocalRoom();
-                    expect(command.isEnabled(client)).toBe(false);
-                });
-            });
-        });
-    });
-
     describe("/part", () => {
         it("should part room matching alias if found", async () => {
             const room1 = new Room("room-id", client, client.getSafeUserId());
@@ -294,6 +254,20 @@ 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 show an error if device is not found", async () => {
+            const spy = jest.spyOn(Modal, "createDialog");
+            const command = findCommand("verify")!;
+            await command.run(client, roomId, null, "mydeviceid myfingerprint").promise;
+            expect(spy).toHaveBeenCalledWith(ErrorDialog, expect.objectContaining({ title: "Verification failed" }));
+        });
+    });
+
     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 3769798d46..0eb2b42ed6 100644
--- a/test/unit-tests/SupportedBrowser-test.ts
+++ b/test/unit-tests/SupportedBrowser-test.ts
@@ -66,17 +66,17 @@ describe("SupportedBrowser", () => {
         // 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",
         // Latest Firefox on macOS Sonoma
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.7; rv:135.0) Gecko/20100101 Firefox/135.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.7; rv:139.0) Gecko/20100101 Firefox/139.0",
         // Latest Edge on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36 Edg/134.0.3124.72",
+        "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",
         // Latest Edge on macOS
-        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36 Edg/134.0.3124.72",
+        "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",
         // Latest Firefox on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:135.0) Gecko/20100101 Firefox/135.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:139.0) Gecko/20100101 Firefox/139.0",
         // Latest Firefox on Linux
-        "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:135.0) Gecko/20100101 Firefox/135.0",
+        "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:139.0) Gecko/20100101 Firefox/139.0",
         // Latest Chrome on Windows
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
     ])("should not warn for supported browsers", testUserAgentFactory());
 
     it.each([
diff --git a/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap b/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
index 09ab44bfcb..018a6721c1 100644
--- a/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
+++ b/test/unit-tests/__snapshots__/HtmlUtils-test.tsx.snap
@@ -64,3 +64,30 @@ exports[`bodyToNode should generate big emoji for an emoji-only reply to a messa
   </span>
 </DocumentFragment>
 `;
+
+exports[`bodyToNode should handle inline media when mediaIsVisible is false 1`] = `
+<DocumentFragment>
+  <span
+    class="mx_EventTile_body markdown-body translate"
+    dir="auto"
+  >
+    <img />
+    foo Hello there
+  </span>
+</DocumentFragment>
+`;
+
+exports[`bodyToNode should handle inline media when mediaIsVisible is true 1`] = `
+<DocumentFragment>
+  <span
+    class="mx_EventTile_body markdown-body translate"
+    dir="auto"
+  >
+    <img
+      src="https://example.org/img"
+      style="max-width:800px;max-height:600px"
+    />
+    foo Hello there
+  </span>
+</DocumentFragment>
+`;
diff --git a/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap b/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
index 1ab32ffd04..6713c3d449 100644
--- a/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
+++ b/test/unit-tests/__snapshots__/TextForEvent-test.ts.snap
@@ -7,8 +7,6 @@ exports[`TextForEvent textForJoinRulesEvent() returns correct JSX message when r
     <AccessibleButton
       kind="link_inline"
       onClick={[Function]}
-      role="button"
-      tabIndex={0}
     >
       View settings
     </AccessibleButton>
diff --git a/test/unit-tests/audio/Playback-test.ts b/test/unit-tests/audio/Playback-test.ts
index 0aeea5c832..7f14685f45 100644
--- a/test/unit-tests/audio/Playback-test.ts
+++ b/test/unit-tests/audio/Playback-test.ts
@@ -47,7 +47,7 @@ describe("Playback", () => {
     beforeEach(() => {
         jest.spyOn(logger, "error").mockRestore();
         mockAudioBuffer.getChannelData.mockClear().mockReturnValue(mockChannelData);
-        mockAudioContext.decodeAudioData.mockReset().mockImplementation((_b, callback) => callback(mockAudioBuffer));
+        mockAudioContext.decodeAudioData.mockReset().mockResolvedValue(mockAudioBuffer);
         mockAudioContext.resume.mockClear().mockResolvedValue(undefined);
         mockAudioContext.suspend.mockClear().mockResolvedValue(undefined);
         mocked(decodeOgg).mockClear().mockResolvedValue(new ArrayBuffer(1));
@@ -131,8 +131,8 @@ describe("Playback", () => {
             const buffer = new ArrayBuffer(8);
             const decodingError = new Error("test");
             mockAudioContext.decodeAudioData
-                .mockImplementationOnce((_b, _callback, error) => error(decodingError))
-                .mockImplementationOnce((_b, callback) => callback(mockAudioBuffer));
+                .mockRejectedValueOnce(decodingError)
+                .mockResolvedValueOnce(mockAudioBuffer);
 
             const playback = new Playback(buffer);
 
diff --git a/test/unit-tests/audio/compat-test.ts b/test/unit-tests/audio/compat-test.ts
new file mode 100644
index 0000000000..da90d61711
--- /dev/null
+++ b/test/unit-tests/audio/compat-test.ts
@@ -0,0 +1,15 @@
+/*
+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 { createAudioContext } from "../../../src/audio/compat";
+
+describe("createAudioContext", () => {
+    it("should throw if AudioContext is not supported", () => {
+        window.AudioContext = undefined as any;
+        expect(createAudioContext).toThrow("Unsupported browser");
+    });
+});
diff --git a/test/unit-tests/autocomplete/EmojiProvider-test.ts b/test/unit-tests/autocomplete/EmojiProvider-test.ts
index 81fd832e64..c2c42691b7 100644
--- a/test/unit-tests/autocomplete/EmojiProvider-test.ts
+++ b/test/unit-tests/autocomplete/EmojiProvider-test.ts
@@ -33,6 +33,10 @@ const EMOJI_SHORTCODES = [
 // to simply assert that the final completion with the colon is the exact emoji.
 const TOO_SHORT_EMOJI_SHORTCODE = [{ emojiShortcode: ":o", expectedEmoji: "⭕️" }];
 
+interface CompletionComponentProps {
+    title: string;
+}
+
 describe("EmojiProvider", function () {
     const testRoom = mkStubRoom(undefined, undefined, undefined);
     stubClient();
@@ -69,8 +73,8 @@ describe("EmojiProvider", function () {
 
         const ep = new EmojiProvider(testRoom);
         const completionsList = await ep.getCompletions(":heart", { beginning: true, start: 0, end: 6 });
-        expect(completionsList[0]?.component?.props.title).toEqual(":heartpulse:");
-        expect(completionsList[1]?.component?.props.title).toEqual(":heart_eyes:");
+        expect((completionsList[0]?.component?.props as CompletionComponentProps).title).toEqual(":heartpulse:");
+        expect((completionsList[1]?.component?.props as CompletionComponentProps).title).toEqual(":heart_eyes:");
     });
 
     it("Exact match in recently used takes the lead", async function () {
@@ -83,8 +87,8 @@ describe("EmojiProvider", function () {
         const ep = new EmojiProvider(testRoom);
         const completionsList = await ep.getCompletions(":heart", { beginning: true, start: 0, end: 6 });
 
-        expect(completionsList[0]?.component?.props.title).toEqual(":heart:");
-        expect(completionsList[1]?.component?.props.title).toEqual(":heartpulse:");
-        expect(completionsList[2]?.component?.props.title).toEqual(":heart_eyes:");
+        expect((completionsList[0]?.component?.props as CompletionComponentProps).title).toEqual(":heart:");
+        expect((completionsList[1]?.component?.props as CompletionComponentProps).title).toEqual(":heartpulse:");
+        expect((completionsList[2]?.component?.props as CompletionComponentProps).title).toEqual(":heart_eyes:");
     });
 });
diff --git a/test/unit-tests/components/structures/AutocompleteInput-test.tsx b/test/unit-tests/components/structures/AutocompleteInput-test.tsx
index 901764f43b..17d443564c 100644
--- a/test/unit-tests/components/structures/AutocompleteInput-test.tsx
+++ b/test/unit-tests/components/structures/AutocompleteInput-test.tsx
@@ -63,12 +63,12 @@ describe("AutocompleteInput", () => {
 
         const input = getEditorInput();
 
-        act(() => {
+        await act(async () => {
             fireEvent.focus(input);
             fireEvent.change(input, { target: { value: "user" } });
+            await waitFor(() => expect(mockProvider.getCompletions).toHaveBeenCalledTimes(1));
         });
 
-        await waitFor(() => expect(mockProvider.getCompletions).toHaveBeenCalledTimes(1));
         expect(screen.getByTestId("autocomplete-matches").childNodes).toHaveLength(mockCompletion.length);
     });
 
@@ -152,12 +152,12 @@ describe("AutocompleteInput", () => {
 
         const input = getEditorInput();
 
-        act(() => {
+        await act(async () => {
             fireEvent.focus(input);
             fireEvent.change(input, { target: { value: "user" } });
+            await waitFor(() => expect(mockProvider.getCompletions).toHaveBeenCalledTimes(1));
         });
 
-        await waitFor(() => expect(mockProvider.getCompletions).toHaveBeenCalledTimes(1));
         expect(screen.getAllByTestId("custom-suggestion-element")).toHaveLength(mockCompletion.length);
     });
 
diff --git a/test/unit-tests/components/structures/MatrixChat-test.tsx b/test/unit-tests/components/structures/MatrixChat-test.tsx
index 3b10a40bb8..94fc9a925a 100644
--- a/test/unit-tests/components/structures/MatrixChat-test.tsx
+++ b/test/unit-tests/components/structures/MatrixChat-test.tsx
@@ -21,7 +21,7 @@ import { completeAuthorizationCodeGrant } from "matrix-js-sdk/src/oidc/authorize
 import { logger } from "matrix-js-sdk/src/logger";
 import { OidcError } from "matrix-js-sdk/src/oidc/error";
 import { type BearerTokenResponse } from "matrix-js-sdk/src/oidc/validate";
-import { defer, type IDeferred, sleep } from "matrix-js-sdk/src/utils";
+import { sleep } from "matrix-js-sdk/src/utils";
 import {
     CryptoEvent,
     type DeviceVerificationStatus,
@@ -68,6 +68,9 @@ import AutoDiscoveryUtils from "../../../../src/utils/AutoDiscoveryUtils";
 import { type ValidatedServerConfig } from "../../../../src/utils/ValidatedServerConfig";
 import Modal from "../../../../src/Modal.tsx";
 import { SetupEncryptionStore } from "../../../../src/stores/SetupEncryptionStore.ts";
+import { ShareFormat } from "../../../../src/dispatcher/payloads/SharePayload.ts";
+import { clearStorage } from "../../../../src/Lifecycle";
+import RoomListStore from "../../../../src/stores/room-list/RoomListStore.ts";
 
 jest.mock("matrix-js-sdk/src/oidc/authorize", () => ({
     completeAuthorizationCodeGrant: jest.fn(),
@@ -85,7 +88,7 @@ describe("<MatrixChat />", () => {
     const deviceId = "qwertyui";
     const accessToken = "abc123";
     const refreshToken = "def456";
-    let bootstrapDeferred: IDeferred<void>;
+    let bootstrapDeferred: PromiseWithResolvers<void>;
     // reused in createClient mock below
     const getMockClientMethods = () => ({
         ...mockClientMethodsUser(userId),
@@ -118,13 +121,13 @@ describe("<MatrixChat />", () => {
             startup: jest.fn(),
         },
         login: jest.fn(),
-        loginFlows: jest.fn(),
+        loginFlows: jest.fn().mockResolvedValue({ flows: [] }),
         isGuest: jest.fn().mockReturnValue(false),
         clearStores: jest.fn(),
         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",
@@ -154,6 +157,7 @@ describe("<MatrixChat />", () => {
         whoami: jest.fn(),
         logout: jest.fn(),
         getDeviceId: jest.fn(),
+        forget: () => Promise.resolve(),
     });
     let mockClient: Mocked<MatrixClient>;
     const serverConfig = {
@@ -165,12 +169,9 @@ describe("<MatrixChat />", () => {
         isNameResolvable: true,
         warning: "",
     };
-    let initPromise: Promise<void> | undefined;
     let defaultProps: ComponentProps<typeof MatrixChat>;
     const getComponent = (props: Partial<ComponentProps<typeof MatrixChat>> = {}) => {
-        // MatrixChat does many questionable things which bomb tests in modern React mode,
-        // we'll want to refactor and break up MatrixChat before turning off legacyRoot mode
-        return render(<MatrixChat {...defaultProps} {...props} />, { legacyRoot: true });
+        return render(<MatrixChat {...defaultProps} {...props} />);
     };
 
     // make test results readable
@@ -220,6 +221,11 @@ describe("<MatrixChat />", () => {
     };
 
     beforeEach(async () => {
+        await clearStorage();
+        Lifecycle.setSessionLockNotStolen();
+
+        localStorage.clear();
+        jest.restoreAllMocks();
         defaultProps = {
             config: {
                 brand: "Test",
@@ -235,10 +241,8 @@ describe("<MatrixChat />", () => {
             onNewScreen: jest.fn(),
             onTokenLoginCompleted: jest.fn(),
             realQueryParams: {},
-            initPromiseCallback: (p: Promise<void>) => (initPromise = p),
         };
 
-        initPromise = undefined;
         mockClient = getMockClientWithEventEmitter(getMockClientMethods());
         jest.spyOn(MatrixJs, "createClient").mockReturnValue(mockClient);
 
@@ -251,24 +255,15 @@ describe("<MatrixChat />", () => {
             {} as ValidatedServerConfig,
         );
 
-        bootstrapDeferred = defer();
+        bootstrapDeferred = Promise.withResolvers();
 
         await clearAllModals();
     });
 
     afterEach(async () => {
-        // Wait for the promise that MatrixChat gives us to complete so that we know
-        // it's finished running its login code. We either need to do this or make the
-        // login code abort halfway through once the test finishes testing whatever it
-        // needs to test. If we do nothing, the login code will just continue running
-        // and interfere with the subsequent tests.
-        await initPromise;
-
         // @ts-ignore
         DMRoomMap.setShared(null);
 
-        jest.restoreAllMocks();
-
         // emit a loggedOut event so that all of the Store singletons forget about their references to the mock client
         // (must be sync otherwise the next test will start before it happens)
         act(() => defaultDispatcher.dispatch({ action: Action.OnLoggedOut }, true));
@@ -313,7 +308,6 @@ describe("<MatrixChat />", () => {
             state: state,
         };
 
-        const userId = "@alice:server.org";
         const deviceId = "test-device-id";
         const accessToken = "test-access-token-from-oidc";
 
@@ -334,9 +328,7 @@ describe("<MatrixChat />", () => {
             await flushPromises();
             const dialog = await screen.findByRole("dialog");
 
-            expect(within(dialog).getByText(errorMessage)).toBeInTheDocument();
-            // just check we're back on welcome page
-            await expect(screen.findByTestId("mx_welcome_screen")).resolves.toBeInTheDocument();
+            await waitFor(() => expect(within(dialog).getByText(errorMessage)).toBeInTheDocument());
         };
 
         beforeEach(() => {
@@ -359,10 +351,6 @@ describe("<MatrixChat />", () => {
                     },
                 });
 
-            jest.spyOn(logger, "error").mockClear();
-        });
-
-        beforeEach(() => {
             loginClient = getMockClientWithEventEmitter(getMockClientMethods());
             // this is used to create a temporary client during login
             jest.spyOn(MatrixJs, "createClient").mockReturnValue(loginClient);
@@ -499,25 +487,32 @@ describe("<MatrixChat />", () => {
                 );
             });
 
+            afterEach(() => {
+                SettingsStore.reset();
+            });
+
             it("should persist login credentials", async () => {
                 getComponent({ realQueryParams });
 
-                await waitFor(() => expect(localStorage.getItem("mx_hs_url")).toEqual(homeserverUrl));
+                await waitFor(() => expect(localStorage.getItem("mx_device_id")).toEqual(deviceId));
+                expect(localStorage.getItem("mx_hs_url")).toEqual(homeserverUrl);
                 expect(localStorage.getItem("mx_user_id")).toEqual(userId);
                 expect(localStorage.getItem("mx_has_access_token")).toEqual("true");
-                expect(localStorage.getItem("mx_device_id")).toEqual(deviceId);
             });
 
             it("should store clientId and issuer in session storage", async () => {
                 getComponent({ realQueryParams });
 
                 await waitFor(() => expect(localStorage.getItem("mx_oidc_client_id")).toEqual(clientId));
-                expect(localStorage.getItem("mx_oidc_token_issuer")).toEqual(issuer);
+                await waitFor(() => expect(localStorage.getItem("mx_oidc_token_issuer")).toEqual(issuer));
             });
 
             it("should set logged in and start MatrixClient", async () => {
                 getComponent({ realQueryParams });
 
+                defaultDispatcher.dispatch({
+                    action: "will_start_client",
+                });
                 // client successfully started
                 await waitFor(() =>
                     expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "client_started" }),
@@ -597,9 +592,7 @@ describe("<MatrixChat />", () => {
             // wait for logged in view to load
             await screen.findByLabelText("User menu");
 
-            expect(screen.queryByRole("progressbar")).not.toBeInTheDocument();
-            const h1Element = screen.getByRole("heading", { level: 1 });
-            expect(h1Element).toHaveTextContent(`Welcome Ernie`);
+            await screen.findByRole("heading", { level: 1, name: "Welcome Ernie" });
         });
 
         describe("clean up drafts", () => {
@@ -612,9 +605,6 @@ describe("<MatrixChat />", () => {
                 localStorage.setItem(`mx_cider_state_${roomId}`, "fake_content");
                 mockClient.getRoom.mockImplementation((id) => [room].find((room) => room.roomId === id) || null);
             });
-            afterEach(() => {
-                jest.restoreAllMocks();
-            });
             it("should clean up drafts", async () => {
                 Date.now = jest.fn(() => timestamp);
                 localStorage.setItem(`mx_cider_state_${roomId}`, "fake_content");
@@ -688,6 +678,34 @@ describe("<MatrixChat />", () => {
                     jest.restoreAllMocks();
                 });
 
+                describe("forget_room", () => {
+                    it("should dispatch after_forget_room action on successful forget", async () => {
+                        await clearAllModals();
+                        await getComponentAndWaitForReady();
+
+                        // Mock out the old room list store
+                        jest.spyOn(RoomListStore.instance, "manualRoomUpdate").mockImplementation(async () => {});
+
+                        // Register a mock function to the dispatcher
+                        const fn = jest.fn();
+                        defaultDispatcher.register(fn);
+
+                        // Forge the room
+                        defaultDispatcher.dispatch({
+                            action: "forget_room",
+                            room_id: roomId,
+                        });
+
+                        // On success, we expect the following action to have been dispatched.
+                        await waitFor(() => {
+                            expect(fn).toHaveBeenCalledWith({
+                                action: Action.AfterForgetRoom,
+                                room: room,
+                            });
+                        });
+                    });
+                });
+
                 describe("leave_room", () => {
                     beforeEach(async () => {
                         await clearAllModals();
@@ -796,6 +814,108 @@ describe("<MatrixChat />", () => {
                         });
                     });
                 });
+
+                it("should open forward dialog when text message shared", async () => {
+                    await getComponentAndWaitForReady();
+                    defaultDispatcher.dispatch({ action: Action.Share, format: ShareFormat.Text, msg: "Hello world" });
+                    await waitFor(() => {
+                        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+                            action: Action.OpenForwardDialog,
+                            event: expect.any(MatrixEvent),
+                            permalinkCreator: null,
+                        });
+                    });
+                    const forwardCall = mocked(defaultDispatcher.dispatch).mock.calls.find(
+                        ([call]) => call.action === Action.OpenForwardDialog,
+                    );
+
+                    const payload = forwardCall?.[0];
+
+                    expect(payload!.event.getContent()).toEqual({
+                        msgtype: MatrixJs.MsgType.Text,
+                        body: "Hello world",
+                    });
+                });
+
+                it("should open forward dialog when html message shared", async () => {
+                    await getComponentAndWaitForReady();
+                    defaultDispatcher.dispatch({ action: Action.Share, format: ShareFormat.Html, msg: "Hello world" });
+                    await waitFor(() => {
+                        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+                            action: Action.OpenForwardDialog,
+                            event: expect.any(MatrixEvent),
+                            permalinkCreator: null,
+                        });
+                    });
+                    const forwardCall = mocked(defaultDispatcher.dispatch).mock.calls.find(
+                        ([call]) => call.action === Action.OpenForwardDialog,
+                    );
+
+                    const payload = forwardCall?.[0];
+
+                    expect(payload!.event.getContent()).toEqual({
+                        msgtype: MatrixJs.MsgType.Text,
+                        format: "org.matrix.custom.html",
+                        body: expect.stringContaining("Hello world"),
+                        formatted_body: expect.stringContaining("Hello world"),
+                    });
+                });
+
+                it("should open forward dialog when markdown message shared", async () => {
+                    await getComponentAndWaitForReady();
+                    defaultDispatcher.dispatch({
+                        action: Action.Share,
+                        format: ShareFormat.Markdown,
+                        msg: "Hello *world*",
+                    });
+                    await waitFor(() => {
+                        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+                            action: Action.OpenForwardDialog,
+                            event: expect.any(MatrixEvent),
+                            permalinkCreator: null,
+                        });
+                    });
+                    const forwardCall = mocked(defaultDispatcher.dispatch).mock.calls.find(
+                        ([call]) => call.action === Action.OpenForwardDialog,
+                    );
+
+                    const payload = forwardCall?.[0];
+
+                    expect(payload!.event.getContent()).toEqual({
+                        msgtype: MatrixJs.MsgType.Text,
+                        format: "org.matrix.custom.html",
+                        body: "Hello *world*",
+                        formatted_body: "Hello <em>world</em>",
+                    });
+                });
+
+                it("should strip malicious tags from shared html message", async () => {
+                    await getComponentAndWaitForReady();
+                    defaultDispatcher.dispatch({
+                        action: Action.Share,
+                        format: ShareFormat.Html,
+                        msg: `evil<script src="http://evil.dummy/bad.js" />`,
+                    });
+                    await waitFor(() => {
+                        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+                            action: Action.OpenForwardDialog,
+                            event: expect.any(MatrixEvent),
+                            permalinkCreator: null,
+                        });
+                    });
+                    const forwardCall = mocked(defaultDispatcher.dispatch).mock.calls.find(
+                        ([call]) => call.action === Action.OpenForwardDialog,
+                    );
+
+                    const payload = forwardCall?.[0];
+
+                    expect(payload!.event.getContent()).toEqual({
+                        msgtype: MatrixJs.MsgType.Text,
+                        format: "org.matrix.custom.html",
+                        body: "evil",
+                        formatted_body: "evil",
+                    });
+                });
             });
 
             describe("logout", () => {
@@ -987,6 +1107,22 @@ describe("<MatrixChat />", () => {
                 } as any;
             }
         });
+
+        describe("showScreen", () => {
+            it("should show the 'share' screen", async () => {
+                await getComponent({
+                    initialScreenAfterLogin: { screen: "share", params: { msg: "Hello", format: ShareFormat.Text } },
+                });
+
+                await waitFor(() => {
+                    expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({
+                        action: "share",
+                        msg: "Hello",
+                        format: ShareFormat.Text,
+                    });
+                });
+            });
+        });
     });
 
     describe("with a soft-logged-out session", () => {
@@ -1113,8 +1249,6 @@ describe("<MatrixChat />", () => {
                     "org.matrix.e2e_cross_signing",
                 );
 
-                await flushPromises();
-
                 // logged in
                 await screen.findByLabelText("User menu");
             });
@@ -1210,7 +1344,6 @@ describe("<MatrixChat />", () => {
         };
 
         let loginClient!: ReturnType<typeof getMockClientWithEventEmitter>;
-        const userId = "@alice:server.org";
         const deviceId = "test-device-id";
         const accessToken = "test-access-token";
         const clientLoginResponse = {
@@ -1304,6 +1437,7 @@ describe("<MatrixChat />", () => {
                     },
                 );
             });
+
             it("should clear storage", async () => {
                 const localStorageClearSpy = jest.spyOn(localStorage.__proto__, "clear");
 
@@ -1349,6 +1483,9 @@ 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",
+                });
 
                 // logged in but waiting for sync screen
                 await screen.findByText("Logout");
@@ -1525,7 +1662,7 @@ describe("<MatrixChat />", () => {
                 jest.spyOn(MatrixJs, "createClient").mockReturnValue(client);
 
                 // intercept initCrypto and have it block until we complete the deferred
-                const initCryptoCompleteDefer = defer();
+                const initCryptoCompleteDefer = Promise.withResolvers<void>();
                 const initCryptoCalled = new Promise<void>((resolve) => {
                     client.initRustCrypto.mockImplementation(() => {
                         resolve();
@@ -1604,8 +1741,13 @@ describe("<MatrixChat />", () => {
             });
             await flushPromises();
             mockClient.emit(CryptoEvent.KeyBackupFailed, "error code");
-            await waitFor(() => expect(spy).toHaveBeenCalledTimes(1));
-            expect((spy.mock.lastCall![0] as any)._payload._result).toEqual(expect.objectContaining({ __test: true }));
+            await waitFor(() =>
+                expect(spy).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        _payload: expect.objectContaining({ _result: expect.objectContaining({ __test: true }) }),
+                    }),
+                ),
+            );
         });
 
         it("should show the recovery method removed dialog", async () => {
@@ -1622,8 +1764,13 @@ describe("<MatrixChat />", () => {
             });
             await flushPromises();
             mockClient.emit(CryptoEvent.KeyBackupFailed, "error code");
-            await waitFor(() => expect(spy).toHaveBeenCalledTimes(1));
-            expect((spy.mock.lastCall![0] as any)._payload._result).toEqual(expect.objectContaining({ __test: true }));
+            await waitFor(() =>
+                expect(spy).toHaveBeenCalledWith(
+                    expect.objectContaining({
+                        _payload: expect.objectContaining({ _result: expect.objectContaining({ __test: true }) }),
+                    }),
+                ),
+            );
         });
     });
 });
diff --git a/test/unit-tests/components/structures/PipContainer-test.tsx b/test/unit-tests/components/structures/PipContainer-test.tsx
index 74b6577444..c401853c2f 100644
--- a/test/unit-tests/components/structures/PipContainer-test.tsx
+++ b/test/unit-tests/components/structures/PipContainer-test.tsx
@@ -148,6 +148,8 @@ describe("PipContainer", () => {
             WidgetStore.instance.addVirtualWidget(call.widget, room.roomId);
             WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
                 stop: () => {},
+                hasCapability: jest.fn(),
+                feedStateUpdate: jest.fn().mockResolvedValue(undefined),
             } as unknown as ClientWidgetApi);
 
             await call.start();
@@ -271,7 +273,10 @@ describe("PipContainer", () => {
                     Parameters<ClientWidgetApi["transport"]["send"]>
                 >()
                 .mockResolvedValue({});
-            const mockMessaging = { transport: { send: sendSpy }, stop: () => {} } as unknown as ClientWidgetApi;
+            const mockMessaging = {
+                transport: { send: sendSpy },
+                stop: () => {},
+            } as unknown as ClientWidgetApi;
             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 c68d755a3a..e53bf06d48 100644
--- a/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx
+++ b/test/unit-tests/components/structures/ReleaseAnnouncement-test.tsx
@@ -23,7 +23,7 @@ describe("ReleaseAnnouncement", () => {
     function renderReleaseAnnouncement() {
         return render(
             <ReleaseAnnouncement
-                feature="threadsActivityCentre"
+                feature="pinningMessageList"
                 header="header"
                 description="description"
                 closeLabel="close"
diff --git a/test/unit-tests/components/structures/RoomSearchView-test.tsx b/test/unit-tests/components/structures/RoomSearchView-test.tsx
index e52da13be6..ab52e8012b 100644
--- a/test/unit-tests/components/structures/RoomSearchView-test.tsx
+++ b/test/unit-tests/components/structures/RoomSearchView-test.tsx
@@ -18,7 +18,6 @@ import {
     SearchResult,
     type ISearchResults,
 } from "matrix-js-sdk/src/matrix";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import { RoomSearchView } from "../../../../src/components/structures/RoomSearchView";
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
@@ -53,7 +52,7 @@ describe("<RoomSearchView/>", () => {
     });
 
     it("should show a spinner before the promise resolves", async () => {
-        const deferred = defer<ISearchResults>();
+        const deferred = Promise.withResolvers<ISearchResults>();
 
         render(
             <RoomSearchView
@@ -247,7 +246,7 @@ describe("<RoomSearchView/>", () => {
 
         await screen.findByRole("progressbar");
         await screen.findByText("Potato");
-        expect(onUpdate).toHaveBeenCalledWith(false, expect.objectContaining({}));
+        expect(onUpdate).toHaveBeenCalledWith(false, expect.objectContaining({}), null);
 
         rerender(
             <MatrixClientContext.Provider value={client}>
@@ -267,7 +266,7 @@ describe("<RoomSearchView/>", () => {
     });
 
     it("should handle resolutions after unmounting sanely", async () => {
-        const deferred = defer<ISearchResults>();
+        const deferred = Promise.withResolvers<ISearchResults>();
 
         const { unmount } = render(
             <MatrixClientContext.Provider value={client}>
@@ -291,7 +290,7 @@ describe("<RoomSearchView/>", () => {
     });
 
     it("should handle rejections after unmounting sanely", async () => {
-        const deferred = defer<ISearchResults>();
+        const deferred = Promise.withResolvers<ISearchResults>();
 
         const { unmount } = render(
             <MatrixClientContext.Provider value={client}>
@@ -314,8 +313,9 @@ describe("<RoomSearchView/>", () => {
         });
     });
 
-    it("should show modal if error is encountered", async () => {
-        const deferred = defer<ISearchResults>();
+    it("report error if one is encountered", async () => {
+        const onUpdate = jest.fn();
+        const deferred = Promise.withResolvers<ISearchResults>();
 
         render(
             <MatrixClientContext.Provider value={client}>
@@ -326,14 +326,18 @@ describe("<RoomSearchView/>", () => {
                     promise={deferred.promise}
                     resizeNotifier={resizeNotifier}
                     className="someClass"
-                    onUpdate={jest.fn()}
+                    onUpdate={onUpdate}
                 />
             </MatrixClientContext.Provider>,
         );
-        deferred.reject(new Error("Some error"));
+        deferred.reject("Some error");
+        try {
+            // Wait for RoomSearchView to process the promise
+            await deferred.promise;
+        } catch {}
 
-        await screen.findByText("Search failed");
-        await screen.findByText("Some error");
+        expect(onUpdate).toHaveBeenCalledWith(false, null, "Some error");
+        expect(onUpdate).toHaveBeenCalledTimes(2);
     });
 
     it("should combine search results when the query is present in multiple sucessive messages", async () => {
diff --git a/test/unit-tests/components/structures/RoomView-test.tsx b/test/unit-tests/components/structures/RoomView-test.tsx
index 2ab7ab7e35..387027f30a 100644
--- a/test/unit-tests/components/structures/RoomView-test.tsx
+++ b/test/unit-tests/components/structures/RoomView-test.tsx
@@ -9,7 +9,6 @@ Please see LICENSE files in the repository root for full details.
 import React, { createRef, type RefObject } from "react";
 import { mocked, type MockedObject } from "jest-mock";
 import {
-    ClientEvent,
     EventTimeline,
     EventType,
     type IEvent,
@@ -19,6 +18,7 @@ import {
     MatrixEvent,
     Room,
     RoomEvent,
+    RoomMember,
     RoomStateEvent,
     SearchResult,
 } from "matrix-js-sdk/src/matrix";
@@ -35,7 +35,6 @@ import {
     cleanup,
 } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import {
     stubClient,
@@ -67,7 +66,6 @@ import { DirectoryMember } from "../../../../src/utils/direct-messages";
 import { createDmLocalRoom } from "../../../../src/utils/dm/createDmLocalRoom";
 import { UPDATE_EVENT } from "../../../../src/stores/AsyncStore";
 import { SDKContext, SdkContextClass } from "../../../../src/contexts/SDKContext";
-import VoipUserMapper from "../../../../src/VoipUserMapper";
 import WidgetUtils from "../../../../src/utils/WidgetUtils";
 import { WidgetType } from "../../../../src/widgets/WidgetType";
 import WidgetStore from "../../../../src/stores/WidgetStore";
@@ -78,6 +76,8 @@ 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 ErrorDialog from "../../../../src/components/views/dialogs/ErrorDialog.tsx";
 
 // Used by group calls
 jest.spyOn(MediaDeviceHandler, "getDevices").mockResolvedValue({
@@ -117,7 +117,6 @@ describe("RoomView", () => {
         stores.client = cli;
         stores.rightPanelStore.useUnitTestClient(cli);
 
-        jest.spyOn(VoipUserMapper.sharedInstance(), "getVirtualRoomForRoom").mockResolvedValue(undefined);
         crypto = cli.getCrypto()!;
         jest.spyOn(cli, "getCrypto").mockReturnValue(undefined);
     });
@@ -196,7 +195,7 @@ describe("RoomView", () => {
                     <RoomView
                         // threepidInvite should be optional on RoomView props
                         // it is treated as optional in RoomView
-                        threepidInvite={undefined as any}
+                        threepidInvite={undefined}
                         resizeNotifier={new ResizeNotifier()}
                         forceTimeline={false}
                         onRegistered={jest.fn()}
@@ -233,6 +232,98 @@ describe("RoomView", () => {
         expect(instance.getHiddenHighlightCount()).toBe(0);
     });
 
+    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);
+        });
+
+        it("renders an invite room", async () => {
+            const { asFragment } = await mountRoomView();
+            expect(asFragment()).toMatchSnapshot();
+        });
+
+        it("handles accepting an invite", async () => {
+            const { getByRole } = await mountRoomView();
+
+            await fireEvent.click(getByRole("button", { name: "Accept" }));
+
+            await untilDispatch(Action.JoinRoomReady, defaultDispatcher);
+        });
+        it("handles declining an invite", async () => {
+            const { getByRole } = await mountRoomView();
+            jest.spyOn(Modal, "createDialog").mockReturnValue({
+                finished: Promise.resolve([true, false, false]),
+                close: jest.fn(),
+            });
+            await fireEvent.click(getByRole("button", { name: "Decline" }));
+            await waitFor(() => expect(cli.leave).toHaveBeenCalledWith(room.roomId));
+            expect(cli.setIgnoredUsers).not.toHaveBeenCalled();
+        });
+        it("handles declining an invite and ignoring the user", async () => {
+            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" })));
+            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({
+                finished: Promise.resolve([true, false, "with a reason"]),
+                close: jest.fn(),
+            });
+            await fireEvent.click(getByRole("button", { name: "Decline and block" }));
+            expect(cli.leave).toHaveBeenCalledWith(room.roomId);
+            expect(cli.reportRoom).toHaveBeenCalledWith(room.roomId, "with a reason");
+        });
+    });
+
     describe("when there is an old room", () => {
         let instance: RoomView;
         let oldRoom: Room;
@@ -313,7 +404,7 @@ describe("RoomView", () => {
     it("should not display the timeline when the room encryption is loading", async () => {
         jest.spyOn(room, "getMyMembership").mockReturnValue(KnownMembership.Join);
         jest.spyOn(cli, "getCrypto").mockReturnValue(crypto);
-        const deferred = defer<boolean>();
+        const deferred = Promise.withResolvers<boolean>();
         jest.spyOn(cli.getCrypto()!, "isEncryptionEnabledInRoom").mockImplementation(() => deferred.promise);
 
         const { asFragment, container } = await mountRoomView();
@@ -359,26 +450,6 @@ describe("RoomView", () => {
         await waitFor(() => expect(container.querySelector(".mx_E2EIcon_verified")).toBeInTheDocument());
     });
 
-    describe("with virtual rooms", () => {
-        it("checks for a virtual room on initial load", async () => {
-            const { container } = await renderRoomView();
-            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalledWith(room.roomId);
-
-            // quick check that rendered without error
-            expect(container.querySelector(".mx_ErrorBoundary")).toBeFalsy();
-        });
-
-        it("checks for a virtual room on room event", async () => {
-            await renderRoomView();
-            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalledWith(room.roomId);
-
-            act(() => cli.emit(ClientEvent.Room, room));
-
-            // called again after room event
-            expect(VoipUserMapper.sharedInstance().getVirtualRoomForRoom).toHaveBeenCalledTimes(2);
-        });
-    });
-
     describe("video rooms", () => {
         beforeEach(async () => {
             await setupAsyncStoreWithClient(CallStore.instance, MatrixClientPeg.safeGet());
@@ -573,129 +644,148 @@ describe("RoomView", () => {
         });
     });
 
-    it("should close search results when edit is clicked", async () => {
-        room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
+    describe("message search", () => {
+        it("should close search results when edit is clicked", async () => {
+            room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
 
-        const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
+            const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
 
-        const roomViewRef = createRef<RoomView>();
-        const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
-        await waitFor(() => expect(roomViewRef.current).toBeTruthy());
-        // @ts-ignore - triggering a search organically is a lot of work
-        act(() =>
-            roomViewRef.current!.setState({
-                search: {
-                    searchId: 1,
-                    roomId: room.roomId,
-                    term: "search term",
-                    scope: SearchScope.Room,
-                    promise: Promise.resolve({
-                        results: [
-                            SearchResult.fromJson(
-                                {
-                                    rank: 1,
-                                    result: {
-                                        content: {
-                                            body: "search term",
-                                            msgtype: "m.text",
+            const roomViewRef = createRef<RoomView>();
+            const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
+            await waitFor(() => expect(roomViewRef.current).toBeTruthy());
+            // @ts-ignore - triggering a search organically is a lot of work
+            act(() =>
+                roomViewRef.current!.setState({
+                    search: {
+                        searchId: 1,
+                        roomId: room.roomId,
+                        term: "search term",
+                        scope: SearchScope.Room,
+                        promise: Promise.resolve({
+                            results: [
+                                SearchResult.fromJson(
+                                    {
+                                        rank: 1,
+                                        result: {
+                                            content: {
+                                                body: "search term",
+                                                msgtype: "m.text",
+                                            },
+                                            type: "m.room.message",
+                                            event_id: "$eventId",
+                                            sender: cli.getSafeUserId(),
+                                            origin_server_ts: 123456789,
+                                            room_id: room.roomId,
                                         },
-                                        type: "m.room.message",
-                                        event_id: "$eventId",
-                                        sender: cli.getSafeUserId(),
-                                        origin_server_ts: 123456789,
-                                        room_id: room.roomId,
-                                    },
-                                    context: {
-                                        events_before: [],
-                                        events_after: [],
-                                        profile_info: {},
-                                    },
-                                },
-                                eventMapper,
-                            ),
-                        ],
-                        highlights: [],
-                        count: 1,
-                    }),
-                    inProgress: false,
-                    count: 1,
-                },
-            }),
-        );
-
-        await waitFor(() => {
-            expect(container.querySelector(".mx_RoomView_searchResultsPanel")).toBeVisible();
-        });
-        const prom = waitForElementToBeRemoved(() => container.querySelector(".mx_RoomView_searchResultsPanel"));
-
-        await userEvent.hover(getByText("search term"));
-        await userEvent.click(await findByLabelText("Edit"));
-
-        await prom;
-    });
-
-    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");
-        rooms.set(room2.roomId, room2);
-
-        room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
-
-        const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
-
-        const roomViewRef = createRef<RoomView>();
-        const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
-        await waitFor(() => expect(roomViewRef.current).toBeTruthy());
-        // @ts-ignore - triggering a search organically is a lot of work
-        act(() =>
-            roomViewRef.current!.setState({
-                search: {
-                    searchId: 1,
-                    roomId: room.roomId,
-                    term: "search term",
-                    scope: SearchScope.All,
-                    promise: Promise.resolve({
-                        results: [
-                            SearchResult.fromJson(
-                                {
-                                    rank: 1,
-                                    result: {
-                                        content: {
-                                            body: "search term",
-                                            msgtype: "m.text",
+                                        context: {
+                                            events_before: [],
+                                            events_after: [],
+                                            profile_info: {},
                                         },
-                                        type: "m.room.message",
-                                        event_id: "$eventId",
-                                        sender: cli.getSafeUserId(),
-                                        origin_server_ts: 123456789,
-                                        room_id: room2.roomId,
                                     },
-                                    context: {
-                                        events_before: [],
-                                        events_after: [],
-                                        profile_info: {},
-                                    },
-                                },
-                                eventMapper,
-                            ),
-                        ],
-                        highlights: [],
+                                    eventMapper,
+                                ),
+                            ],
+                            highlights: [],
+                            count: 1,
+                        }),
+                        inProgress: false,
                         count: 1,
-                    }),
-                    inProgress: false,
-                    count: 1,
-                },
-            }),
-        );
+                    },
+                }),
+            );
 
-        await waitFor(() => {
-            expect(container.querySelector(".mx_RoomView_searchResultsPanel")).toBeVisible();
+            await waitFor(() => {
+                expect(container.querySelector(".mx_RoomView_searchResultsPanel")).toBeVisible();
+            });
+            const prom = waitForElementToBeRemoved(() => container.querySelector(".mx_RoomView_searchResultsPanel"));
+
+            await userEvent.hover(getByText("search term"));
+            await userEvent.click(await findByLabelText("Edit"));
+
+            await prom;
         });
-        const prom = untilDispatch(Action.ViewRoom, defaultDispatcher);
 
-        await userEvent.hover(getByText("search term"));
-        await userEvent.click(await findByLabelText("Edit"));
+        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");
+            rooms.set(room2.roomId, room2);
 
-        await expect(prom).resolves.toEqual(expect.objectContaining({ room_id: room2.roomId }));
+            room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
+
+            const eventMapper = (obj: Partial<IEvent>) => new MatrixEvent(obj);
+
+            const roomViewRef = createRef<RoomView>();
+            const { container, getByText, findByLabelText } = await mountRoomView(roomViewRef);
+            await waitFor(() => expect(roomViewRef.current).toBeTruthy());
+            // @ts-ignore - triggering a search organically is a lot of work
+            act(() =>
+                roomViewRef.current!.setState({
+                    search: {
+                        searchId: 1,
+                        roomId: room.roomId,
+                        term: "search term",
+                        scope: SearchScope.All,
+                        promise: Promise.resolve({
+                            results: [
+                                SearchResult.fromJson(
+                                    {
+                                        rank: 1,
+                                        result: {
+                                            content: {
+                                                body: "search term",
+                                                msgtype: "m.text",
+                                            },
+                                            type: "m.room.message",
+                                            event_id: "$eventId",
+                                            sender: cli.getSafeUserId(),
+                                            origin_server_ts: 123456789,
+                                            room_id: room2.roomId,
+                                        },
+                                        context: {
+                                            events_before: [],
+                                            events_after: [],
+                                            profile_info: {},
+                                        },
+                                    },
+                                    eventMapper,
+                                ),
+                            ],
+                            highlights: [],
+                            count: 1,
+                        }),
+                        inProgress: false,
+                        count: 1,
+                    },
+                }),
+            );
+
+            await waitFor(() => {
+                expect(container.querySelector(".mx_RoomView_searchResultsPanel")).toBeVisible();
+            });
+            const prom = untilDispatch(Action.ViewRoom, defaultDispatcher);
+
+            await userEvent.hover(getByText("search term"));
+            await userEvent.click(await findByLabelText("Edit"));
+
+            await expect(prom).resolves.toEqual(expect.objectContaining({ room_id: room2.roomId }));
+        });
+
+        it("should pre-fill search field on FocusMessageSearch dispatch", async () => {
+            room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Join);
+
+            const roomViewRef = createRef<RoomView>();
+            const { findByPlaceholderText } = await mountRoomView(roomViewRef);
+            await waitFor(() => expect(roomViewRef.current).toBeTruthy());
+
+            act(() =>
+                defaultDispatcher.dispatch({
+                    action: Action.FocusMessageSearch,
+                    initialText: "search term",
+                }),
+            );
+
+            await expect(findByPlaceholderText("Search messages…")).resolves.toHaveValue("search term");
+        });
     });
 
     it("fires Action.RoomLoaded", async () => {
diff --git a/test/unit-tests/components/structures/TimelinePanel-test.tsx b/test/unit-tests/components/structures/TimelinePanel-test.tsx
index 886fe777e4..354036e282 100644
--- a/test/unit-tests/components/structures/TimelinePanel-test.tsx
+++ b/test/unit-tests/components/structures/TimelinePanel-test.tsx
@@ -35,7 +35,6 @@ import { forEachRight } from "lodash";
 import TimelinePanel from "../../../../src/components/structures/TimelinePanel";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
-import { isCallEvent } from "../../../../src/components/structures/LegacyCallEventGrouper";
 import {
     filterConsole,
     flushPromises,
@@ -50,6 +49,8 @@ import SettingsStore from "../../../../src/settings/SettingsStore";
 import ScrollPanel from "../../../../src/components/structures/ScrollPanel";
 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";
 
 // ScrollPanel calls this, but jsdom doesn't mock it for us
 HTMLDivElement.prototype.scrollBy = () => {};
@@ -113,22 +114,6 @@ const setupTestData = (): [MatrixClient, Room, MatrixEvent[]] => {
     return [client, room, events];
 };
 
-const setupOverlayTestData = (client: MatrixClient, mainEvents: MatrixEvent[]): [Room, MatrixEvent[]] => {
-    const virtualRoom = mkRoom(client, "virtualRoomId");
-    const overlayEvents = mockEvents(virtualRoom, 5);
-
-    // Set the event order that we'll be looking for in the timeline
-    overlayEvents[0].localTimestamp = 1000;
-    mainEvents[0].localTimestamp = 2000;
-    overlayEvents[1].localTimestamp = 3000;
-    overlayEvents[2].localTimestamp = 4000;
-    overlayEvents[3].localTimestamp = 5000;
-    mainEvents[1].localTimestamp = 6000;
-    overlayEvents[4].localTimestamp = 7000;
-
-    return [virtualRoom, overlayEvents];
-};
-
 const expectEvents = (container: HTMLElement, events: MatrixEvent[]): void => {
     const eventTiles = container.querySelectorAll(".mx_EventTile");
     const eventTileIds = [...eventTiles].map((tileElement) => tileElement.getAttribute("data-event-id"));
@@ -310,18 +295,14 @@ describe("TimelinePanel", () => {
 
             describe("and sending receipts is disabled", () => {
                 beforeEach(async () => {
-                    client.isVersionSupported.mockResolvedValue(true);
-                    client.doesServerSupportUnstableFeature.mockResolvedValue(true);
-
-                    jest.spyOn(SettingsStore, "getValue").mockImplementation((setting: string): any => {
-                        if (setting === "sendReadReceipts") return false;
-
-                        return undefined;
-                    });
+                    // Ensure this setting is supported, otherwise it will use the default value.
+                    client.isVersionSupported.mockImplementation(async (v) => v === "v1.4");
+                    MatrixClientBackedController.matrixClient = client;
+                    SettingsStore.setValue("sendReadReceipts", null, SettingLevel.DEVICE, false);
                 });
 
                 afterEach(() => {
-                    mocked(SettingsStore.getValue).mockReset();
+                    SettingsStore.reset();
                 });
 
                 it("should send a fully read marker and a private receipt", async () => {
@@ -520,298 +501,6 @@ describe("TimelinePanel", () => {
 
             expect(paginateSpy).toHaveBeenCalledWith(EventTimeline.FORWARDS, 1, false);
         });
-
-        it("advances the overlay timeline window", async () => {
-            const [client, room, events] = setupTestData();
-
-            const virtualRoom = mkRoom(client, "virtualRoomId");
-            const virtualEvents = mockEvents(virtualRoom);
-            const { timelineSet: overlayTimelineSet } = getProps(virtualRoom, virtualEvents);
-
-            const props = {
-                ...getProps(room, events),
-                overlayTimelineSet,
-            };
-
-            const paginateSpy = jest.spyOn(TimelineWindow.prototype, "paginate").mockClear();
-
-            render(<TimelinePanel {...props} />);
-
-            await flushPromises();
-
-            const event = new MatrixEvent({ type: RoomEvent.Timeline, origin_server_ts: 0 });
-            const data = { timeline: props.timelineSet.getLiveTimeline(), liveEvent: true };
-            client.emit(RoomEvent.Timeline, event, room, false, false, data);
-
-            await flushPromises();
-
-            expect(paginateSpy).toHaveBeenCalledTimes(2);
-        });
-    });
-
-    describe("with overlayTimeline", () => {
-        it("renders merged timeline", async () => {
-            const [client, room, events] = setupTestData();
-            const virtualRoom = mkRoom(client, "virtualRoomId");
-            const virtualCallInvite = new MatrixEvent({
-                type: "m.call.invite",
-                room_id: virtualRoom.roomId,
-                event_id: `virtualCallEvent1`,
-                origin_server_ts: 0,
-            });
-            virtualCallInvite.localTimestamp = 2;
-            const virtualCallMetaEvent = new MatrixEvent({
-                type: "org.matrix.call.sdp_stream_metadata_changed",
-                room_id: virtualRoom.roomId,
-                event_id: `virtualCallEvent2`,
-                origin_server_ts: 0,
-            });
-            virtualCallMetaEvent.localTimestamp = 2;
-            const virtualEvents = [virtualCallInvite, ...mockEvents(virtualRoom), virtualCallMetaEvent];
-            const { timelineSet: overlayTimelineSet } = getProps(virtualRoom, virtualEvents);
-
-            const { container } = render(
-                <TimelinePanel
-                    {...getProps(room, events)}
-                    overlayTimelineSet={overlayTimelineSet}
-                    overlayTimelineSetFilter={isCallEvent}
-                />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-            );
-            await waitFor(() =>
-                expectEvents(container, [
-                    // main timeline events are included
-                    events[0],
-                    events[1],
-                    // virtual timeline call event is included
-                    virtualCallInvite,
-                    // virtual call event has no tile renderer => not rendered
-                ]),
-            );
-        });
-
-        it.each([
-            ["when it starts with no overlay events", true],
-            ["to get enough overlay events", false],
-        ])("expands the initial window %s", async (_s, startWithEmptyOverlayWindow) => {
-            const [client, room, events] = setupTestData();
-            const [virtualRoom, overlayEvents] = setupOverlayTestData(client, events);
-
-            let overlayEventsPage1: MatrixEvent[];
-            let overlayEventsPage2: MatrixEvent[];
-            let overlayEventsPage3: MatrixEvent[];
-            if (startWithEmptyOverlayWindow) {
-                overlayEventsPage1 = overlayEvents.slice(0, 3);
-                overlayEventsPage2 = [];
-                overlayEventsPage3 = overlayEvents.slice(3, 5);
-            } else {
-                overlayEventsPage1 = overlayEvents.slice(0, 2);
-                overlayEventsPage2 = overlayEvents.slice(2, 3);
-                overlayEventsPage3 = overlayEvents.slice(3, 5);
-            }
-
-            // Start with only page 2 of the overlay events in the window
-            const [overlayTimeline, overlayTimelineSet] = mkTimeline(virtualRoom, overlayEventsPage2);
-            setupPagination(client, overlayTimeline, overlayEventsPage1, overlayEventsPage3);
-
-            const { container } = render(
-                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-            );
-
-            await waitFor(() =>
-                expectEvents(container, [
-                    overlayEvents[0],
-                    events[0],
-                    overlayEvents[1],
-                    overlayEvents[2],
-                    overlayEvents[3],
-                    events[1],
-                    overlayEvents[4],
-                ]),
-            );
-        });
-
-        it("extends overlay window beyond main window at the start of the timeline", async () => {
-            const [client, room, events] = setupTestData();
-            const [virtualRoom, overlayEvents] = setupOverlayTestData(client, events);
-            // Delete event 0 so the TimelinePanel will still leave some stuff
-            // unloaded for us to test with
-            events.shift();
-
-            const overlayEventsPage1 = overlayEvents.slice(0, 2);
-            const overlayEventsPage2 = overlayEvents.slice(2, 5);
-
-            // Start with only page 2 of the overlay events in the window
-            const [overlayTimeline, overlayTimelineSet] = mkTimeline(virtualRoom, overlayEventsPage2);
-            setupPagination(client, overlayTimeline, overlayEventsPage1, null);
-
-            const { container } = render(
-                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-            );
-
-            await waitFor(() =>
-                expectEvents(container, [
-                    // These first two are the newly loaded events
-                    overlayEvents[0],
-                    overlayEvents[1],
-                    overlayEvents[2],
-                    overlayEvents[3],
-                    events[0],
-                    overlayEvents[4],
-                ]),
-            );
-        });
-
-        it("extends overlay window beyond main window at the end of the timeline", async () => {
-            const [client, room, events] = setupTestData();
-            const [virtualRoom, overlayEvents] = setupOverlayTestData(client, events);
-            // Delete event 1 so the TimelinePanel will still leave some stuff
-            // unloaded for us to test with
-            events.pop();
-
-            const overlayEventsPage1 = overlayEvents.slice(0, 2);
-            const overlayEventsPage2 = overlayEvents.slice(2, 5);
-
-            // Start with only page 1 of the overlay events in the window
-            const [overlayTimeline, overlayTimelineSet] = mkTimeline(virtualRoom, overlayEventsPage1);
-            setupPagination(client, overlayTimeline, null, overlayEventsPage2);
-
-            const { container } = render(
-                <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-            );
-
-            await waitFor(() =>
-                expectEvents(container, [
-                    overlayEvents[0],
-                    events[0],
-                    overlayEvents[1],
-                    // These are the newly loaded events
-                    overlayEvents[2],
-                    overlayEvents[3],
-                    overlayEvents[4],
-                ]),
-            );
-        });
-
-        it("paginates", async () => {
-            const [client, room, events] = setupTestData();
-            const [virtualRoom, overlayEvents] = setupOverlayTestData(client, events);
-
-            const eventsPage1 = events.slice(0, 1);
-            const eventsPage2 = events.slice(1, 2);
-
-            // Start with only page 1 of the main events in the window
-            const [timeline, timelineSet] = mkTimeline(room, eventsPage1);
-            const [, overlayTimelineSet] = mkTimeline(virtualRoom, overlayEvents);
-            setupPagination(client, timeline, null, eventsPage2);
-
-            await withScrollPanelMountSpy(async (mountSpy) => {
-                const { container } = render(
-                    <TimelinePanel
-                        {...getProps(room, events)}
-                        timelineSet={timelineSet}
-                        overlayTimelineSet={overlayTimelineSet}
-                    />,
-                    withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-                );
-
-                await waitFor(() => expectEvents(container, [overlayEvents[0], events[0]]));
-
-                // ScrollPanel has no chance of working in jsdom, so we've no choice
-                // but to do some shady stuff to trigger the fill callback by hand
-                const scrollPanel = mountSpy.mock.contexts[0] as ScrollPanel;
-                scrollPanel.props.onFillRequest!(false);
-
-                await waitFor(() =>
-                    expectEvents(container, [
-                        overlayEvents[0],
-                        events[0],
-                        overlayEvents[1],
-                        overlayEvents[2],
-                        overlayEvents[3],
-                        events[1],
-                        overlayEvents[4],
-                    ]),
-                );
-            });
-        });
-
-        it.each([
-            ["down", "main", true, false],
-            ["down", "overlay", true, true],
-            ["up", "main", false, false],
-            ["up", "overlay", false, true],
-        ])("unpaginates %s to an event from the %s timeline", async (_s1, _s2, backwards, fromOverlay) => {
-            const [client, room, events] = setupTestData();
-            const [virtualRoom, overlayEvents] = setupOverlayTestData(client, events);
-
-            let marker: MatrixEvent;
-            let expectedEvents: MatrixEvent[];
-            if (backwards) {
-                if (fromOverlay) {
-                    marker = overlayEvents[1];
-                    // Overlay events 0−1 and event 0 should be unpaginated
-                    // Overlay events 2−3 should be hidden since they're at the edge of the window
-                    expectedEvents = [events[1], overlayEvents[4]];
-                } else {
-                    marker = events[0];
-                    // Overlay event 0 and event 0 should be unpaginated
-                    // Overlay events 1−3 should be hidden since they're at the edge of the window
-                    expectedEvents = [events[1], overlayEvents[4]];
-                }
-            } else {
-                if (fromOverlay) {
-                    marker = overlayEvents[4];
-                    // Only the last overlay event should be unpaginated
-                    expectedEvents = [
-                        overlayEvents[0],
-                        events[0],
-                        overlayEvents[1],
-                        overlayEvents[2],
-                        overlayEvents[3],
-                        events[1],
-                    ];
-                } else {
-                    // Get rid of overlay event 4 so we can test the case where no overlay events get unpaginated
-                    overlayEvents.pop();
-                    marker = events[1];
-                    // Only event 1 should be unpaginated
-                    // Overlay events 1−2 should be hidden since they're at the edge of the window
-                    expectedEvents = [overlayEvents[0], events[0]];
-                }
-            }
-
-            const [, overlayTimelineSet] = mkTimeline(virtualRoom, overlayEvents);
-
-            await withScrollPanelMountSpy(async (mountSpy) => {
-                const { container } = render(
-                    <TimelinePanel {...getProps(room, events)} overlayTimelineSet={overlayTimelineSet} />,
-                    withClientContextRenderOptions(MatrixClientPeg.safeGet()),
-                );
-
-                await waitFor(() =>
-                    expectEvents(container, [
-                        overlayEvents[0],
-                        events[0],
-                        overlayEvents[1],
-                        overlayEvents[2],
-                        overlayEvents[3],
-                        events[1],
-                        ...(!backwards && !fromOverlay ? [] : [overlayEvents[4]]),
-                    ]),
-                );
-
-                // ScrollPanel has no chance of working in jsdom, so we've no choice
-                // but to do some shady stuff to trigger the unfill callback by hand
-                const scrollPanel = mountSpy.mock.contexts[0] as ScrollPanel;
-                scrollPanel.props.onUnfillRequest!(backwards, marker.getId()!);
-
-                await waitFor(() => expectEvents(container, expectedEvents));
-            });
-        });
     });
 
     describe("when a thread updates", () => {
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 cc900cdf5a..f311521960 100644
--- a/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/FilePanel-test.tsx.snap
@@ -19,7 +19,7 @@ exports[`FilePanel renders empty state 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
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 f7f825afcd..bb748e820a 100644
--- a/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/MessagePanel-test.tsx.snap
@@ -108,9 +108,7 @@ exports[`MessagePanel should handle lots of membership events quickly 1`] = `
               <span
                 class="mx_TextualEvent mx_GenericEventListSummary_summary"
               >
-                <span>
-                  @user:id made no changes 100 times
-                </span>
+                @user:id made no changes 100 times
               </span>
             </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 f1321a3229..8d909a6797 100644
--- a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -58,7 +58,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
-            aria-labelledby=":rg4:"
+            aria-labelledby="«rg4»"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -74,7 +74,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
       <button
         aria-disabled="false"
         aria-label="Voice call"
-        aria-labelledby=":rg9:"
+        aria-labelledby="«rg9»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -99,7 +99,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
       </button>
       <button
         aria-label="Threads"
-        aria-labelledby=":rge:"
+        aria-labelledby="«rge»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -125,7 +125,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
       </button>
       <button
         aria-label="Room info"
-        aria-labelledby=":rgj:"
+        aria-labelledby="«rgj»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -154,7 +154,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
       >
         <div
           aria-label="2 members"
-          aria-labelledby=":rgo:"
+          aria-labelledby="«rgo»"
           class="mx_AccessibleButton mx_FacePile"
           role="button"
           tabindex="0"
@@ -273,7 +273,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
-            aria-labelledby=":rh2:"
+            aria-labelledby="«rh2»"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -289,7 +289,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
       <button
         aria-disabled="false"
         aria-label="Voice call"
-        aria-labelledby=":rh7:"
+        aria-labelledby="«rh7»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -314,7 +314,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
       </button>
       <button
         aria-label="Threads"
-        aria-labelledby=":rhc:"
+        aria-labelledby="«rhc»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -340,7 +340,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
       </button>
       <button
         aria-label="Room info"
-        aria-labelledby=":rhh:"
+        aria-labelledby="«rhh»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -369,7 +369,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
       >
         <div
           aria-label="2 members"
-          aria-labelledby=":rhm:"
+          aria-labelledby="«rhm»"
           class="mx_AccessibleButton mx_FacePile"
           role="button"
           tabindex="0"
@@ -573,7 +573,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
-            aria-labelledby=":rbo:"
+            aria-labelledby="«rbo»"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -589,7 +589,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
       <button
         aria-disabled="false"
         aria-label="Voice call"
-        aria-labelledby=":rbt:"
+        aria-labelledby="«rbt»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -614,7 +614,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
       </button>
       <button
         aria-label="Threads"
-        aria-labelledby=":rc2:"
+        aria-labelledby="«rc2»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -640,7 +640,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
       </button>
       <button
         aria-label="Room info"
-        aria-labelledby=":rc7:"
+        aria-labelledby="«rc7»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -669,7 +669,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
       >
         <div
           aria-label="2 members"
-          aria-labelledby=":rcc:"
+          aria-labelledby="«rcc»"
           class="mx_AccessibleButton mx_FacePile"
           role="button"
           tabindex="0"
@@ -950,7 +950,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
-            aria-labelledby=":rdu:"
+            aria-labelledby="«rdu»"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -966,7 +966,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
       <button
         aria-disabled="false"
         aria-label="Voice call"
-        aria-labelledby=":re3:"
+        aria-labelledby="«re3»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -991,7 +991,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
       </button>
       <button
         aria-label="Threads"
-        aria-labelledby=":re8:"
+        aria-labelledby="«re8»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -1017,7 +1017,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
       </button>
       <button
         aria-label="Room info"
-        aria-labelledby=":red:"
+        aria-labelledby="«red»"
         class="_icon-button_m2erp_8"
         role="button"
         style="--cpd-icon-button-size: 32px;"
@@ -1046,7 +1046,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
       >
         <div
           aria-label="2 members"
-          aria-labelledby=":rei:"
+          aria-labelledby="«rei»"
           class="mx_AccessibleButton mx_FacePile"
           role="button"
           tabindex="0"
@@ -1264,6 +1264,79 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
 </div>
 `;
 
+exports[`RoomView invites renders an invite room 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomView"
+  >
+    <div
+      class="mx_RoomPreviewBar mx_RoomPreviewBar_Invite mx_RoomPreviewBar_dialog"
+      role="complementary"
+    >
+      <div
+        class="mx_RoomPreviewBar_message"
+      >
+        <h3>
+          Do you want to join !2:example.org?
+        </h3>
+        <p>
+          <span
+            class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
+            data-color="4"
+            data-testid="avatar-img"
+            data-type="round"
+            role="presentation"
+            style="--cpd-avatar-size: 36px;"
+          >
+            !
+          </span>
+        </p>
+        <p>
+          <span>
+            Invited by 
+            <span
+              class="mx_RoomPreviewBar_inviter"
+            >
+              @bob:example.org
+            </span>
+          </span>
+        </p>
+      </div>
+      <div
+        class="mx_RoomPreviewBar_actions"
+      >
+        <div
+          class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
+          role="button"
+          tabindex="0"
+        >
+          Accept
+        </div>
+        <div
+          class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
+          role="button"
+          tabindex="0"
+        >
+          Decline
+        </div>
+        <button
+          class="_button_vczzf_8 _destructive_vczzf_107"
+          data-kind="tertiary"
+          data-size="lg"
+          role="button"
+          tabindex="0"
+        >
+          Decline and block
+        </button>
+      </div>
+      <div
+        class="mx_RoomPreviewBar_footer"
+      />
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`RoomView should not display the timeline when the room encryption is loading 1`] = `
 <DocumentFragment>
   <div
@@ -1290,7 +1363,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             aria-label="Open room settings"
             aria-live="off"
             class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="2"
+            data-color="5"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1317,7 +1390,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !6:example.org
+                  !12:example.org
                 </span>
               </div>
             </div>
@@ -1335,7 +1408,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
             >
               <svg
-                aria-labelledby=":r2c:"
+                aria-labelledby="«r2c»"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1351,7 +1424,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           <button
             aria-disabled="true"
             aria-label="There's no one here to call"
-            aria-labelledby=":r2h:"
+            aria-labelledby="«r2h»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1376,7 +1449,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby=":r2m:"
+            aria-labelledby="«r2m»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1402,7 +1475,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby=":r2r:"
+            aria-labelledby="«r2r»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1431,7 +1504,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby=":r30:"
+              aria-labelledby="«r30»"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -1498,7 +1571,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
             aria-label="Open room settings"
             aria-live="off"
             class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="2"
+            data-color="5"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1525,7 +1598,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !6:example.org
+                  !12:example.org
                 </span>
               </div>
             </div>
@@ -1543,7 +1616,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
               style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
             >
               <svg
-                aria-labelledby=":r2c:"
+                aria-labelledby="«r2c»"
                 fill="currentColor"
                 height="1em"
                 viewBox="0 0 24 24"
@@ -1559,7 +1632,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           <button
             aria-disabled="true"
             aria-label="There's no one here to call"
-            aria-labelledby=":r2h:"
+            aria-labelledby="«r2h»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1584,7 +1657,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby=":r2m:"
+            aria-labelledby="«r2m»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1610,7 +1683,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby=":r2r:"
+            aria-labelledby="«r2r»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1639,7 +1712,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
           >
             <div
               aria-label="0 members"
-              aria-labelledby=":r30:"
+              aria-labelledby="«r30»"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -1707,7 +1780,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
                   tabindex="0"
                 >
                   <div
-                    aria-labelledby=":r3e:"
+                    aria-labelledby="«r3e»"
                     class="mx_E2EIcon mx_E2EIcon_verified mx_MessageComposer_e2eIcon"
                   />
                 </span>
@@ -1879,7 +1952,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
             aria-label="Open room settings"
             aria-live="off"
             class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
-            data-color="6"
+            data-color="4"
             data-testid="avatar-img"
             data-type="round"
             role="button"
@@ -1906,14 +1979,14 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 <span
                   class="mx_RoomHeader_truncated mx_lineClamp"
                 >
-                  !13:example.org
+                  !17:example.org
                 </span>
               </div>
             </div>
           </button>
           <button
             aria-label="Chat"
-            aria-labelledby=":r7c:"
+            aria-labelledby="«r7c»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1939,7 +2012,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Threads"
-            aria-labelledby=":r7h:"
+            aria-labelledby="«r7h»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1965,7 +2038,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           </button>
           <button
             aria-label="Room info"
-            aria-labelledby=":r7m:"
+            aria-labelledby="«r7m»"
             class="_icon-button_m2erp_8"
             role="button"
             style="--cpd-icon-button-size: 32px;"
@@ -1994,7 +2067,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
           >
             <div
               aria-label="0 members"
-              aria-labelledby=":r7r:"
+              aria-labelledby="«r7r»"
               class="mx_AccessibleButton mx_FacePile"
               role="button"
               tabindex="0"
@@ -2048,6 +2121,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
       >
         <aside
           class="mx_RightPanel"
+          data-testid="right-panel"
           id="mx_RightPanel"
         >
           <div
@@ -2067,7 +2141,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
                 </p>
               </div>
               <button
-                aria-labelledby=":r84:"
+                aria-labelledby="«r84»"
                 class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
                 data-testid="base-card-close-button"
                 role="button"
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 a5d3f5093a..0a64ec5f61 100644
--- a/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/SpaceHierarchy-test.tsx.snap
@@ -58,7 +58,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
     role="tree"
   >
     <li
-      aria-labelledby=":r8:"
+      aria-labelledby="«r8»"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -88,7 +88,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id=":r8:"
+              id="«r8»"
             >
               Unnamed Room
             </span>
@@ -122,7 +122,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                   class="_container_1hel1_10"
                 >
                   <input
-                    aria-labelledby=":r8:"
+                    aria-labelledby="«r8»"
                     class="_input_1hel1_18"
                     id="checkbox_MwbPDmfGtm"
                     role="presentation"
@@ -156,7 +156,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       </div>
     </li>
     <li
-      aria-labelledby=":rc:"
+      aria-labelledby="«rc»"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -186,7 +186,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id=":rc:"
+              id="«rc»"
             >
               Unnamed Room
             </span>
@@ -220,7 +220,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                   class="_container_1hel1_10"
                 >
                   <input
-                    aria-labelledby=":rc:"
+                    aria-labelledby="«rc»"
                     class="_input_1hel1_18"
                     id="checkbox_GQvdMWe954"
                     role="presentation"
@@ -254,7 +254,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       </div>
     </li>
     <li
-      aria-labelledby=":rg:"
+      aria-labelledby="«rg»"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -284,7 +284,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id=":rg:"
+              id="«rg»"
             >
               Knock room
             </span>
@@ -318,7 +318,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                   class="_container_1hel1_10"
                 >
                   <input
-                    aria-labelledby=":rg:"
+                    aria-labelledby="«rg»"
                     class="_input_1hel1_18"
                     id="checkbox_DVIAu5CsiH"
                     role="presentation"
@@ -353,7 +353,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
     </li>
     <li
       aria-expanded="true"
-      aria-labelledby=":rk:"
+      aria-labelledby="«rk»"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -383,7 +383,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id=":rk:"
+              id="«rk»"
             >
               Nested space
             </span>
@@ -417,7 +417,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                   class="_container_1hel1_10"
                 >
                   <input
-                    aria-labelledby=":rk:"
+                    aria-labelledby="«rk»"
                     class="_input_1hel1_18"
                     id="checkbox_RD7nyrA2oh"
                     role="presentation"
@@ -458,7 +458,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
       />
     </li>
     <li
-      aria-labelledby=":ro:"
+      aria-labelledby="«ro»"
       class="mx_SpaceHierarchy_roomTileWrapper"
       role="treeitem"
     >
@@ -488,7 +488,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             class="mx_SpaceHierarchy_roomTile_name"
           >
             <span
-              id=":ro:"
+              id="«ro»"
             >
               Nested room
             </span>
@@ -510,7 +510,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
             Join
           </div>
           <span
-            aria-labelledby=":rp:"
+            aria-labelledby="«rp»"
             tabindex="0"
           >
             <form
@@ -526,7 +526,7 @@ exports[`SpaceHierarchy <SpaceHierarchy /> renders 1`] = `
                     class="_container_1hel1_10"
                   >
                     <input
-                      aria-labelledby=":ro:"
+                      aria-labelledby="«ro»"
                       class="_input_1hel1_18"
                       disabled=""
                       id="checkbox_jWVJIPauy1"
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 347d7b87d0..41b789d831 100644
--- a/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/ThreadPanel-test.tsx.snap
@@ -6,7 +6,7 @@ exports[`ThreadPanel Header expect that All filter for ThreadPanelHeader properl
     class="mx_ThreadPanelHeader"
   >
     <button
-      aria-labelledby=":r0:"
+      aria-labelledby="«r0»"
       class="_icon-button_m2erp_8"
       role="button"
       style="--cpd-icon-button-size: 28px;"
@@ -44,7 +44,7 @@ exports[`ThreadPanel Header expect that My filter for ThreadPanelHeader properly
     class="mx_ThreadPanelHeader"
   >
     <button
-      aria-labelledby=":r6:"
+      aria-labelledby="«r6»"
       class="_icon-button_m2erp_8"
       role="button"
       style="--cpd-icon-button-size: 28px;"
diff --git a/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx b/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
index 1c9cd97ce2..c5efd81f0d 100644
--- a/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
+++ b/test/unit-tests/components/structures/auth/CompleteSecurity-test.tsx
@@ -6,7 +6,7 @@ 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 } from "jest-mock";
 import EventEmitter from "events";
 
@@ -76,4 +76,20 @@ describe("CompleteSecurity", () => {
 
         expect(screen.queryByRole("button", { name: "Skip verification for now" })).not.toBeInTheDocument();
     });
+
+    it("Renders a warning if user hits Reset", async () => {
+        // Given a store and a dialog based on it
+        const store = new SetupEncryptionStore();
+        jest.spyOn(SetupEncryptionStore, "sharedInstance").mockReturnValue(store);
+        const panel = await act(() => render(<CompleteSecurity onFinished={() => {}} />));
+
+        // When we hit reset
+        await act(async () => panel.getByRole("button", { name: "Proceed with reset" }).click());
+
+        // Then the reset identity dialog appears
+        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/viewmodels/avatars/RoomAvatarViewModel-test.tsx b/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx
new file mode 100644
index 0000000000..5f29f3ff33
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/avatars/RoomAvatarViewModel-test.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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 { JoinRule, type MatrixClient, type Room, RoomMember, User } from "matrix-js-sdk/src/matrix";
+
+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([]),
+}));
+
+describe("RoomAvatarViewModel", () => {
+    let matrixClient: MatrixClient;
+    let room: Room;
+
+    beforeEach(() => {
+        matrixClient = createTestClient();
+        room = mkStubRoom("roomId", "roomName", matrixClient);
+
+        DMRoomMap.makeShared(matrixClient);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+
+        jest.spyOn(PresenceIndicatorModule, "useDmMember").mockReturnValue(null);
+        jest.spyOn(PresenceIndicatorModule, "usePresence").mockReturnValue(null);
+    });
+
+    it("should have badgeDecoration set to LowPriority", () => {
+        room.tags[DefaultTagID.LowPriority] = {};
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.LowPriority);
+    });
+
+    it("should have badgeDecoration set to VideoRoom", () => {
+        jest.spyOn(room, "isCallRoom").mockReturnValue(true);
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.badgeDecoration).toBe(AvatarBadgeDecoration.VideoRoom);
+    });
+
+    it("should have badgeDecoration set to PublicRoom", () => {
+        jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Public);
+        const { result: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        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.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.badgeDecoration).toBe(AvatarBadgeDecoration.PublicRoom));
+    });
+
+    it("should return presence", async () => {
+        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: vm } = renderHook(() => useRoomAvatarViewModel(room));
+        expect(vm.current.presence).toBe(PresenceIndicatorModule.Presence.Online);
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel-test.tsx
new file mode 100644
index 0000000000..b1db7bcb19
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel-test.tsx
@@ -0,0 +1,91 @@
+/*
+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 { act, type SyntheticEvent } from "react";
+
+import { useRoomTopicViewModel } from "../../../../../src/components/viewmodels/right_panel/RoomSummaryCardTopicViewModel";
+import { createTestClient, mkStubRoom } from "../../../../test-utils";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
+import { onRoomTopicLinkClick } from "../../../../../src/components/views/elements/RoomTopic";
+
+jest.mock("../../../../../src/components/views/elements/RoomTopic");
+
+describe("RoomSummaryCardTopicViewModel", () => {
+    const client = createTestClient();
+    const mockRoom = mkStubRoom("!room:example.com", "Test Room", client);
+    const mockUserId = "@user:example.com";
+    const mockEvent = { preventDefault: jest.fn(), stopPropagation: jest.fn() } as unknown as SyntheticEvent;
+
+    beforeEach(() => {
+        // Mock room client's getSafeUserId
+        mockRoom.client.getSafeUserId = jest.fn().mockReturnValue(mockUserId);
+        jest.spyOn(defaultDispatcher, "dispatch");
+
+        (onRoomTopicLinkClick as jest.Mock).mockReset();
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    function render() {
+        return renderHook(() => useRoomTopicViewModel(mockRoom));
+    }
+
+    it("should initialize with expanded state", () => {
+        const { result } = render();
+        expect(result.current.expanded).toBe(true);
+    });
+
+    it("should toggle expanded state on click", async () => {
+        const { result } = render();
+
+        await act(() => {
+            result.current.onExpandedClick(mockEvent);
+        });
+
+        expect(result.current.expanded).toBe(false);
+    });
+
+    it("should handle edit click", () => {
+        const { result } = render();
+        result.current.onEditClick(mockEvent);
+        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "open_room_settings" });
+    });
+
+    it("should handle topic link clicks when the target is an anchor element", () => {
+        const { result } = render();
+        const mockAnchorEvent = { target: document.createElement("a") } as unknown as React.MouseEvent<HTMLElement>;
+
+        result.current.onTopicLinkClick(mockAnchorEvent);
+        expect(onRoomTopicLinkClick).toHaveBeenCalledWith(mockAnchorEvent);
+    });
+
+    it("should handle topic link clicks when the target is not an anchor element", () => {
+        const { result } = render();
+        const mockNonAnchorEvent = {
+            target: document.createElement("div"),
+        } as unknown as React.MouseEvent<HTMLElement>;
+
+        result.current.onTopicLinkClick(mockNonAnchorEvent);
+        expect(onRoomTopicLinkClick).not.toHaveBeenCalled();
+    });
+
+    describe("Topic editing permissions", () => {
+        it("should allow editing when user has permission", () => {
+            mockRoom.currentState.maySendStateEvent = jest.fn().mockReturnValue(true);
+            const { result } = render();
+            expect(result.current.canEditTopic).toBe(true);
+        });
+
+        it("should not allow editing when user lacks permission", () => {
+            mockRoom.currentState.maySendStateEvent = jest.fn().mockReturnValue(false);
+            const { result } = render();
+            expect(result.current.canEditTopic).toBe(false);
+        });
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardViewModel-test.tsx b/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardViewModel-test.tsx
new file mode 100644
index 0000000000..0c5745a086
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/right_panel/RoomSummaryCardViewModel-test.tsx
@@ -0,0 +1,265 @@
+/*
+ * 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 { act, renderHook, waitFor } from "jest-matrix-react";
+import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
+
+import { useRoomSummaryCardViewModel } from "../../../../../src/components/viewmodels/right_panel/RoomSummaryCardViewModel";
+import { mkStubRoom, stubClient, withClientContextRenderOptions } from "../../../../test-utils";
+import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
+import RoomListStore from "../../../../../src/stores/room-list/RoomListStore";
+import { DefaultTagID } from "../../../../../src/stores/room-list/models";
+import RightPanelStore from "../../../../../src/stores/right-panel/RightPanelStore";
+import { RightPanelPhases } from "../../../../../src/stores/right-panel/RightPanelStorePhases";
+import Modal from "../../../../../src/Modal";
+import { ShareDialog } from "../../../../../src/components/views/dialogs/ShareDialog";
+import ExportDialog from "../../../../../src/components/views/dialogs/ExportDialog";
+import { PollHistoryDialog } from "../../../../../src/components/views/dialogs/PollHistoryDialog";
+import { ReportRoomDialog } from "../../../../../src/components/views/dialogs/ReportRoomDialog";
+import { inviteToRoom } from "../../../../../src/utils/room/inviteToRoom";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import * as hooks from "../../../../../src/hooks/useAccountData";
+
+jest.mock("../../../../../src/utils/room/inviteToRoom", () => ({
+    inviteToRoom: jest.fn(),
+}));
+
+describe("useRoomSummaryCardViewModel", () => {
+    let matrixClient: MatrixClient;
+    let room: Room;
+    let permalinkCreator: any;
+    const onSearchCancel = jest.fn();
+
+    beforeEach(() => {
+        matrixClient = stubClient();
+        room = mkStubRoom("roomId", "roomName", matrixClient);
+        permalinkCreator = {};
+
+        DMRoomMap.setShared({
+            getUserIdForRoomId: jest.fn(),
+        } as unknown as DMRoomMap);
+
+        jest.spyOn(RoomListStore.instance, "getTagsForRoom").mockReturnValue([]);
+    });
+
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+
+    function render() {
+        return renderHook(
+            () => useRoomSummaryCardViewModel(room, permalinkCreator, onSearchCancel),
+            withClientContextRenderOptions(matrixClient),
+        );
+    }
+
+    it("should return correct initial state", () => {
+        const { result } = render();
+
+        expect(result.current.isDirectMessage).toBe(false);
+        expect(result.current.isRoomEncrypted).toBe(false);
+        expect(result.current.isVideoRoom).toBe(false);
+        expect(result.current.isFavorite).toBe(false);
+        expect(result.current.pinCount).toBe(0);
+        expect(result.current.searchInputRef.current).toBe(null);
+    });
+
+    it("should handle room members click", () => {
+        const spy = jest.spyOn(RightPanelStore.instance, "pushCard");
+        const { result } = render();
+
+        result.current.onRoomMembersClick();
+        expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.MemberList }, true);
+    });
+
+    it("should handle room settings click", () => {
+        const spy = jest.spyOn(defaultDispatcher, "dispatch");
+        const { result } = render();
+
+        result.current.onRoomSettingsClick(new Event("click"));
+        expect(spy).toHaveBeenCalledWith({ action: "open_room_settings" });
+    });
+
+    it("should handle leave room click", () => {
+        const spy = jest.spyOn(defaultDispatcher, "dispatch");
+        const { result } = render();
+
+        result.current.onLeaveRoomClick();
+        expect(spy).toHaveBeenCalledWith({
+            action: "leave_room",
+            room_id: room.roomId,
+        });
+    });
+
+    it("should handle room threads click", () => {
+        const spy = jest.spyOn(RightPanelStore.instance, "pushCard");
+        const { result } = render();
+
+        result.current.onRoomThreadsClick();
+        expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.ThreadPanel }, true);
+    });
+
+    it("should handle room files click", () => {
+        const spy = jest.spyOn(RightPanelStore.instance, "pushCard");
+        const { result } = render();
+
+        result.current.onRoomFilesClick();
+        expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.FilePanel }, true);
+    });
+
+    it("should handle room extensions click", () => {
+        const spy = jest.spyOn(RightPanelStore.instance, "pushCard");
+        const { result } = render();
+
+        result.current.onRoomExtensionsClick();
+        expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.Extensions }, true);
+    });
+
+    it("should handle room pins click", () => {
+        const spy = jest.spyOn(RightPanelStore.instance, "pushCard");
+        const { result } = render();
+
+        result.current.onRoomPinsClick();
+        expect(spy).toHaveBeenCalledWith({ phase: RightPanelPhases.PinnedMessages }, true);
+    });
+
+    it("should handle room invite click", () => {
+        const { result } = render();
+
+        result.current.onInviteToRoomClick();
+        expect(inviteToRoom).toHaveBeenCalledWith(room);
+    });
+
+    describe("action that trigger a dialog", () => {
+        let createDialogSpy: jest.SpyInstance;
+
+        beforeEach(() => {
+            createDialogSpy = jest.spyOn(Modal, "createDialog").mockImplementation(() => ({
+                finished: Promise.resolve([false]),
+                close: jest.fn(),
+            }));
+        });
+
+        afterEach(() => {
+            createDialogSpy.mockRestore();
+        });
+
+        it("should handle room export click", async () => {
+            const { result } = render();
+
+            await act(async () => {
+                await result.current.onRoomExportClick();
+            });
+            expect(createDialogSpy).toHaveBeenCalledWith(ExportDialog, { room });
+        });
+
+        it("should handle room poll history click", async () => {
+            const { result } = render();
+
+            await act(async () => {
+                await result.current.onRoomPollHistoryClick();
+            });
+            expect(createDialogSpy).toHaveBeenCalledWith(PollHistoryDialog, {
+                room,
+                matrixClient,
+                permalinkCreator,
+            });
+        });
+
+        it("should handle room report click", async () => {
+            const { result } = render();
+
+            await act(async () => {
+                await result.current.onReportRoomClick();
+            });
+
+            expect(createDialogSpy).toHaveBeenCalledWith(ReportRoomDialog, { roomId: room.roomId });
+        });
+
+        it("should handle share room click", async () => {
+            const { result } = render();
+
+            await act(async () => {
+                await result.current.onShareRoomClick();
+            });
+
+            expect(createDialogSpy).toHaveBeenCalledWith(ShareDialog, {
+                target: room,
+            });
+        });
+    });
+
+    describe("favorite room state", () => {
+        it("should identify favorite rooms", () => {
+            jest.spyOn(RoomListStore.instance, "getTagsForRoom").mockReturnValue([DefaultTagID.Favourite]);
+            const { result } = render();
+
+            expect(result.current.isFavorite).toBe(true);
+        });
+
+        it("should identify non-favorite rooms", () => {
+            jest.spyOn(RoomListStore.instance, "getTagsForRoom").mockReturnValue([]);
+            const { result } = render();
+
+            expect(result.current.isFavorite).toBe(false);
+        });
+    });
+
+    describe("direct message state", () => {
+        it("should identify direct message rooms", async () => {
+            // Mock the direct rooms account data
+            const directRoomsList = {
+                "@user:domain.com": [room.roomId],
+            };
+            // Mock the useAccountData hook result
+            jest.spyOn(hooks, "useAccountData").mockReturnValue(directRoomsList);
+
+            const { result } = render();
+
+            await waitFor(() => {
+                expect(result.current.isDirectMessage).toBe(true);
+            });
+        });
+
+        it("should identify non-direct message rooms", async () => {
+            // Mock the direct rooms account data
+            const directRoomsList = {};
+            // Mock the useAccountData hook result
+            jest.spyOn(hooks, "useAccountData").mockReturnValue(directRoomsList);
+
+            const { result } = render();
+
+            await waitFor(() => {
+                expect(result.current.isDirectMessage).toBe(false);
+            });
+        });
+    });
+
+    describe("search input", () => {
+        it("should handle search input escape key", () => {
+            const directRoomsList = {};
+            jest.spyOn(hooks, "useAccountData").mockReturnValue(directRoomsList);
+            const { result } = render();
+            // Create a mock input element and set it as the current ref value
+            const mockInputElement = document.createElement("input");
+            mockInputElement.value = "some search text";
+
+            result.current.searchInputRef.current = mockInputElement;
+
+            const event = {
+                key: "Escape",
+                preventDefault: jest.fn(),
+                stopPropagation: jest.fn(),
+            };
+
+            result.current.onUpdateSearchInput(event as any);
+
+            expect(onSearchCancel).toHaveBeenCalled();
+            expect(mockInputElement?.value).toBe("");
+        });
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
index 399943b6cf..f9fe45202a 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx
@@ -5,9 +5,10 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-import { renderHook } from "jest-matrix-react";
+import { renderHook, act } from "jest-matrix-react";
 import { JoinRule, type MatrixClient, type Room, RoomType } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
+import { range } from "lodash";
 
 import { useRoomListHeaderViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
 import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
@@ -23,6 +24,9 @@ import {
     showSpaceSettings,
 } from "../../../../../src/utils/space";
 import { createRoom, hasCreateRoomRights } from "../../../../../src/components/viewmodels/roomlist/utils";
+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";
 
 jest.mock("../../../../../src/components/viewmodels/roomlist/utils", () => ({
     hasCreateRoomRights: jest.fn().mockReturnValue(false),
@@ -80,14 +84,6 @@ describe("useRoomListHeaderViewModel", () => {
         expect(result.current.canCreateRoom).toBe(true);
     });
 
-    it("should be displayComposeMenu=true if the user can creates video room", () => {
-        mocked(hasCreateRoomRights).mockReturnValue(false);
-        jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
-
-        const { result } = render();
-        expect(result.current.displayComposeMenu).toBe(true);
-    });
-
     it("should be displaySpaceMenu=true if the user is in a space", () => {
         jest.spyOn(SpaceStore.instance, "activeSpaceRoom", "get").mockReturnValue(space);
         const { result } = render();
@@ -118,8 +114,10 @@ describe("useRoomListHeaderViewModel", () => {
         expect(result.current.canAccessSpaceSettings).toBe(true);
     });
 
-    it("should be canCreateVideoRoom=true if feature_video_rooms is enabled", () => {
+    it("should be canCreateVideoRoom=true if feature_video_rooms is enabled and can create room", () => {
+        mocked(hasCreateRoomRights).mockReturnValue(true);
         jest.spyOn(SettingsStore, "getValue").mockReturnValue(true);
+
         const { result } = render();
         expect(result.current.canCreateVideoRoom).toBe(true);
     });
@@ -205,4 +203,38 @@ describe("useRoomListHeaderViewModel", () => {
 
         expect(showSpaceSettings).toHaveBeenCalledWith(space);
     });
+
+    describe("Sorting", () => {
+        function mockAndCreateRooms() {
+            const rooms = range(10).map((i) => mkStubRoom(`foo${i}:matrix.org`, `Foo ${i}`, undefined));
+            const fn = jest
+                .spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace")
+                .mockImplementation(() => [...rooms]);
+            return { rooms, fn };
+        }
+
+        it("should change sort order", () => {
+            mockAndCreateRooms();
+            const { result: vm } = render();
+
+            const resort = jest.spyOn(RoomListStoreV3.instance, "resort").mockImplementation(() => {});
+
+            // Change the sort option
+            act(() => {
+                vm.current.sort(SortOption.AToZ);
+            });
+
+            // Resort method in RLS must have been called
+            expect(resort).toHaveBeenCalledWith(SortingAlgorithm.Alphabetic);
+        });
+
+        it("should set activeSortOption based on value from settings", () => {
+            // Let's say that the user's preferred sorting is alphabetic
+            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => SortingAlgorithm.Alphabetic);
+
+            mockAndCreateRooms();
+            const { result: vm } = render();
+            expect(vm.current.activeSortOption).toEqual(SortOption.AToZ);
+        });
+    });
 });
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
index 89dd644208..ddb3cba609 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListItemMenuViewModel-test.tsx
@@ -11,7 +11,10 @@ import { type MatrixClient, type Room } from "matrix-js-sdk/src/matrix";
 
 import { mkStubRoom, stubClient, withClientContextRenderOptions } from "../../../../test-utils";
 import { useRoomListItemMenuViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListItemMenuViewModel";
-import { hasAccessToOptionsMenu } from "../../../../../src/components/viewmodels/roomlist/utils";
+import {
+    hasAccessToNotificationMenu,
+    hasAccessToOptionsMenu,
+} from "../../../../../src/components/viewmodels/roomlist/utils";
 import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { DefaultTagID } from "../../../../../src/stores/room-list/models";
 import { useUnreadNotifications } from "../../../../../src/hooks/useUnreadNotifications";
@@ -19,15 +22,22 @@ import { NotificationLevel } from "../../../../../src/stores/notifications/Notif
 import { clearRoomNotification, setMarkedUnreadState } from "../../../../../src/utils/notifications";
 import { tagRoom } from "../../../../../src/utils/room/tagRoom";
 import dispatcher from "../../../../../src/dispatcher/dispatcher";
+import { useNotificationState } from "../../../../../src/hooks/useRoomNotificationState";
+import { RoomNotifState } from "../../../../../src/RoomNotifs";
 
 jest.mock("../../../../../src/components/viewmodels/roomlist/utils", () => ({
     hasAccessToOptionsMenu: jest.fn().mockReturnValue(false),
+    hasAccessToNotificationMenu: jest.fn().mockReturnValue(false),
 }));
 
 jest.mock("../../../../../src/hooks/useUnreadNotifications", () => ({
     useUnreadNotifications: jest.fn(),
 }));
 
+jest.mock("../../../../../src/hooks/useRoomNotificationState", () => ({
+    useNotificationState: jest.fn(),
+}));
+
 jest.mock("../../../../../src/utils/notifications", () => ({
     clearRoomNotification: jest.fn(),
     setMarkedUnreadState: jest.fn(),
@@ -49,6 +59,7 @@ describe("RoomListItemMenuViewModel", () => {
         jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
 
         mocked(useUnreadNotifications).mockReturnValue({ symbol: null, count: 0, level: NotificationLevel.None });
+        mocked(useNotificationState).mockReturnValue([RoomNotifState.AllMessages, jest.fn()]);
         jest.spyOn(dispatcher, "dispatch");
     });
 
@@ -76,6 +87,12 @@ describe("RoomListItemMenuViewModel", () => {
         expect(result.current.showMoreOptionsMenu).toBe(true);
     });
 
+    it("should has showNotificationMenu to be true", () => {
+        mocked(hasAccessToNotificationMenu).mockReturnValue(true);
+        const { result } = render();
+        expect(result.current.showNotificationMenu).toBe(true);
+    });
+
     it("should be able to invite", () => {
         jest.spyOn(room, "canInvite").mockReturnValue(true);
         const { result } = render();
@@ -106,6 +123,29 @@ describe("RoomListItemMenuViewModel", () => {
         expect(result.current.canMarkAsUnread).toBe(false);
     });
 
+    it("should has isNotificationAllMessage to be true", () => {
+        const { result } = render();
+        expect(result.current.isNotificationAllMessage).toBe(true);
+    });
+
+    it("should has isNotificationAllMessageLoud to be true", () => {
+        mocked(useNotificationState).mockReturnValue([RoomNotifState.AllMessagesLoud, jest.fn()]);
+        const { result } = render();
+        expect(result.current.isNotificationAllMessageLoud).toBe(true);
+    });
+
+    it("should has isNotificationMentionOnly to be true", () => {
+        mocked(useNotificationState).mockReturnValue([RoomNotifState.MentionsOnly, jest.fn()]);
+        const { result } = render();
+        expect(result.current.isNotificationMentionOnly).toBe(true);
+    });
+
+    it("should has isNotificationMute to be true", () => {
+        mocked(useNotificationState).mockReturnValue([RoomNotifState.Mute, jest.fn()]);
+        const { result } = render();
+        expect(result.current.isNotificationMute).toBe(true);
+    });
+
     // Actions
 
     it("should mark as read", () => {
@@ -170,4 +210,12 @@ describe("RoomListItemMenuViewModel", () => {
             room_id: room.roomId,
         });
     });
+
+    it("should call setRoomNotifState", () => {
+        const setRoomNotifState = jest.fn();
+        mocked(useNotificationState).mockReturnValue([RoomNotifState.AllMessages, setRoomNotifState]);
+        const { result } = render();
+        result.current.setRoomNotifState(RoomNotifState.Mute);
+        expect(setRoomNotifState).toHaveBeenCalledWith(RoomNotifState.Mute);
+    });
 });
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
index caba9abd1e..c58ae4168c 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListItemViewModel-test.tsx
@@ -5,20 +5,32 @@
  * 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 { type Room } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 
 import dispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { useRoomListItemViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListItemViewModel";
-import { createTestClient, mkStubRoom } from "../../../../test-utils";
-import { hasAccessToOptionsMenu } from "../../../../../src/components/viewmodels/roomlist/utils";
+import { createTestClient, mkStubRoom, withClientContextRenderOptions } from "../../../../test-utils";
+import {
+    hasAccessToNotificationMenu,
+    hasAccessToOptionsMenu,
+} from "../../../../../src/components/viewmodels/roomlist/utils";
 import { RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
 import { RoomNotificationStateStore } from "../../../../../src/stores/notifications/RoomNotificationStateStore";
+import * as UseCallModule from "../../../../../src/hooks/useCall";
+import { type MessagePreview, MessagePreviewStore } from "../../../../../src/stores/room-list/MessagePreviewStore";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import { useMessagePreviewToggle } from "../../../../../src/components/viewmodels/roomlist/useMessagePreviewToggle";
 
 jest.mock("../../../../../src/components/viewmodels/roomlist/utils", () => ({
     hasAccessToOptionsMenu: jest.fn().mockReturnValue(false),
+    hasAccessToNotificationMenu: jest.fn().mockReturnValue(false),
+}));
+
+jest.mock("../../../../../src/components/viewmodels/roomlist/useMessagePreviewToggle", () => ({
+    useMessagePreviewToggle: jest.fn().mockReturnValue({ shouldShowMessagePreview: true }),
 }));
 
 describe("RoomListItemViewModel", () => {
@@ -27,10 +39,28 @@ describe("RoomListItemViewModel", () => {
     beforeEach(() => {
         const matrixClient = createTestClient();
         room = mkStubRoom("roomId", "roomName", matrixClient);
+
+        const dmRoomMap = {
+            getUserIdForRoomId: jest.fn(),
+            getDMRoomsForUserId: jest.fn(),
+        } as unknown as DMRoomMap;
+        DMRoomMap.setShared(dmRoomMap);
+
+        mocked(useMessagePreviewToggle).mockReturnValue({
+            shouldShowMessagePreview: false,
+            toggleMessagePreview: jest.fn(),
+        });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
     });
 
     it("should dispatch view room action on openRoom", async () => {
-        const { result: vm } = renderHook(() => useRoomListItemViewModel(room));
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
 
         const fn = jest.spyOn(dispatcher, "dispatch");
         vm.current.openRoom();
@@ -45,10 +75,152 @@ describe("RoomListItemViewModel", () => {
 
     it("should show hover menu if user has access to options menu", async () => {
         mocked(hasAccessToOptionsMenu).mockReturnValue(true);
-        const { result: vm } = renderHook(() => useRoomListItemViewModel(room));
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
         expect(vm.current.showHoverMenu).toBe(true);
     });
 
+    it("should show hover menu if user has access to notification menu", async () => {
+        mocked(hasAccessToNotificationMenu).mockReturnValue(true);
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
+        expect(vm.current.showHoverMenu).toBe(true);
+    });
+
+    it("should not show hover menu if user has an invitation notification", async () => {
+        mocked(hasAccessToOptionsMenu).mockReturnValue(true);
+
+        const notificationState = new RoomNotificationState(room, false);
+        jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockReturnValue(notificationState);
+        jest.spyOn(notificationState, "invited", "get").mockReturnValue(false);
+
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
+        expect(vm.current.showHoverMenu).toBe(true);
+    });
+
+    it("should return a message preview if one is available and they are enabled", async () => {
+        jest.spyOn(MessagePreviewStore.instance, "getPreviewForRoom").mockResolvedValue({
+            text: "Message look like this",
+        } as MessagePreview);
+        mocked(useMessagePreviewToggle).mockReturnValue({
+            shouldShowMessagePreview: true,
+            toggleMessagePreview: jest.fn(),
+        });
+
+        const { result: vm } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
+        await waitFor(() => expect(vm.current.messagePreview).toBe("Message look like this"));
+    });
+
+    it("should hide message previews when disabled", async () => {
+        jest.spyOn(MessagePreviewStore.instance, "getPreviewForRoom").mockResolvedValue({
+            text: "Message look like this",
+        } as MessagePreview);
+
+        const { result: vm, rerender } = renderHook(
+            () => useRoomListItemViewModel(room),
+            withClientContextRenderOptions(room.client),
+        );
+
+        // This doesn't seem to test that the hook actually triggers an update,
+        // but I can't see how to test that.
+        rerender();
+
+        expect(vm.current.messagePreview).toBe(undefined);
+    });
+
+    it("should check message preview when room change", async () => {
+        const otherRoom = mkStubRoom("roomId2", "roomName2", room.client);
+
+        jest.spyOn(MessagePreviewStore.instance, "getPreviewForRoom").mockResolvedValue({
+            text: "Message look like this",
+        } as MessagePreview);
+        mocked(useMessagePreviewToggle).mockReturnValue({
+            shouldShowMessagePreview: true,
+            toggleMessagePreview: jest.fn(),
+        });
+
+        const { result: vm, rerender } = renderHook((props) => useRoomListItemViewModel(props), {
+            initialProps: room,
+            ...withClientContextRenderOptions(room.client),
+        });
+        await waitFor(() => expect(vm.current.messagePreview).toBe("Message look like this"));
+
+        jest.spyOn(MessagePreviewStore.instance, "getPreviewForRoom").mockResolvedValue(null);
+        rerender(otherRoom);
+        await waitFor(() => expect(vm.current.messagePreview).toBe(undefined));
+    });
+
+    describe("notification", () => {
+        let notificationState: RoomNotificationState;
+        beforeEach(() => {
+            notificationState = new RoomNotificationState(room, false);
+            jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockReturnValue(notificationState);
+        });
+
+        it("should show notification decoration if there is call has participant", () => {
+            jest.spyOn(UseCallModule, "useParticipantCount").mockReturnValue(1);
+
+            const { result: vm } = renderHook(
+                () => useRoomListItemViewModel(room),
+                withClientContextRenderOptions(room.client),
+            );
+            expect(vm.current.showNotificationDecoration).toBe(true);
+        });
+
+        it.each([
+            {
+                label: "hasAnyNotificationOrActivity",
+                mock: () => jest.spyOn(notificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true),
+            },
+            { label: "muted", mock: () => jest.spyOn(notificationState, "muted", "get").mockReturnValue(true) },
+        ])("should show notification decoration if $label=true", ({ mock }) => {
+            mock();
+            const { result: vm } = renderHook(
+                () => useRoomListItemViewModel(room),
+                withClientContextRenderOptions(room.client),
+            );
+            expect(vm.current.showNotificationDecoration).toBe(true);
+        });
+
+        it("should be bold if there is a notification", () => {
+            jest.spyOn(notificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+
+            const { result: vm } = renderHook(
+                () => useRoomListItemViewModel(room),
+                withClientContextRenderOptions(room.client),
+            );
+            expect(vm.current.isBold).toBe(true);
+        });
+
+        it("should recompute notification state when room changes", () => {
+            const newRoom = mkStubRoom("room2", "Room 2", room.client);
+            const newNotificationState = new RoomNotificationState(newRoom, false);
+
+            const { result, rerender } = renderHook((room) => useRoomListItemViewModel(room), {
+                ...withClientContextRenderOptions(room.client),
+                initialProps: room,
+            });
+
+            expect(result.current.showNotificationDecoration).toBe(false);
+
+            jest.spyOn(newNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+            jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockReturnValue(newNotificationState);
+            rerender(newRoom);
+
+            expect(result.current.showNotificationDecoration).toBe(true);
+        });
+    });
+
     describe("a11yLabel", () => {
         let notificationState: RoomNotificationState;
         beforeEach(() => {
@@ -58,9 +230,9 @@ describe("RoomListItemViewModel", () => {
 
         it.each([
             {
-                label: "unset message",
-                mock: () => jest.spyOn(notificationState, "isUnsetMessage", "get").mockReturnValue(true),
-                expected: "Open room roomName with an unset message.",
+                label: "unsent message",
+                mock: () => jest.spyOn(notificationState, "isUnsentMessage", "get").mockReturnValue(true),
+                expected: "Open room roomName with an unsent message.",
             },
             {
                 label: "invitation",
@@ -89,7 +261,10 @@ describe("RoomListItemViewModel", () => {
             },
         ])("should return the $label label", ({ mock, expected }) => {
             mock?.();
-            const { result: vm } = renderHook(() => useRoomListItemViewModel(room));
+            const { result: vm } = renderHook(
+                () => useRoomListItemViewModel(room),
+                withClientContextRenderOptions(room.client),
+            );
             expect(vm.current.a11yLabel).toBe(expected);
         });
     });
diff --git a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
index 50d0fc4518..9607cf9218 100644
--- a/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
+++ b/test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
@@ -9,19 +9,16 @@ import { range } from "lodash";
 import { act, renderHook, waitFor } from "jest-matrix-react";
 import { mocked } from "jest-mock";
 
-import RoomListStoreV3 from "../../../../../src/stores/room-list-v3/RoomListStoreV3";
+import RoomListStoreV3, { LISTS_UPDATE_EVENT } from "../../../../../src/stores/room-list-v3/RoomListStoreV3";
 import { mkStubRoom } from "../../../../test-utils";
-import { LISTS_UPDATE_EVENT } from "../../../../../src/stores/room-list/RoomListStore";
 import { useRoomListViewModel } from "../../../../../src/components/viewmodels/roomlist/RoomListViewModel";
 import { FilterKey } from "../../../../../src/stores/room-list-v3/skip-list/filters";
-import { SecondaryFilters } from "../../../../../src/components/viewmodels/roomlist/useFilteredRooms";
-import { SortingAlgorithm } from "../../../../../src/stores/room-list-v3/skip-list/sorters";
-import { SortOption } from "../../../../../src/components/viewmodels/roomlist/useSorter";
-import SettingsStore from "../../../../../src/settings/SettingsStore";
 import { hasCreateRoomRights, createRoom } from "../../../../../src/components/viewmodels/roomlist/utils";
 import dispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
+import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
+import { UPDATE_SELECTED_SPACE } from "../../../../../src/stores/spaces";
 
 jest.mock("../../../../../src/components/viewmodels/roomlist/utils", () => ({
     hasCreateRoomRights: jest.fn().mockReturnValue(false),
@@ -57,7 +54,7 @@ describe("RoomListViewModel", () => {
 
         const newRoom = mkStubRoom("bar:matrix.org", "Bar", undefined);
         rooms.push(newRoom);
-        act(() => RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT));
+        await act(() => RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT));
 
         await waitFor(() => {
             expect(vm.current.rooms).toContain(newRoom);
@@ -68,10 +65,18 @@ describe("RoomListViewModel", () => {
         it("should provide list of available filters", () => {
             mockAndCreateRooms();
             const { result: vm } = renderHook(() => useRoomListViewModel());
-            // should have 4 filters
-            expect(vm.current.primaryFilters).toHaveLength(4);
+            // should have 6 filters
+            expect(vm.current.primaryFilters).toHaveLength(7);
             // check the order
-            for (const [i, name] of ["Unread", "Favourites", "People", "Rooms"].entries()) {
+            for (const [i, name] of [
+                "Unreads",
+                "People",
+                "Rooms",
+                "Mentions",
+                "Invites",
+                "Favourites",
+                "Low priority",
+            ].entries()) {
                 expect(vm.current.primaryFilters[i].name).toEqual(name);
                 expect(vm.current.primaryFilters[i].active).toEqual(false);
             }
@@ -109,46 +114,6 @@ describe("RoomListViewModel", () => {
             expect(vm.current.primaryFilters[j].active).toEqual(true);
         });
 
-        it("should select all activity as default secondary filter", () => {
-            mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-
-            // By default, all activity should be the active secondary filter
-            expect(vm.current.activeSecondaryFilter).toEqual(SecondaryFilters.AllActivity);
-        });
-
-        it("should be able to filter using secondary filters", () => {
-            const { fn } = mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-
-            // Let's say we toggle the mentions secondary filter
-            act(() => {
-                vm.current.activateSecondaryFilter(SecondaryFilters.MentionsOnly);
-            });
-            expect(fn).toHaveBeenCalledWith([FilterKey.MentionsFilter]);
-        });
-
-        it("primary filters are applied on top of secondary filers", () => {
-            const { fn } = mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-
-            // Let's say we toggle the mentions secondary filter
-            act(() => {
-                vm.current.activateSecondaryFilter(SecondaryFilters.MentionsOnly);
-            });
-
-            // Let's say we toggle the People filter
-            const i = vm.current.primaryFilters.findIndex((f) => f.name === "People");
-            act(() => {
-                vm.current.primaryFilters[i].toggle();
-            });
-
-            // RLS call must include both these filters
-            expect(fn).toHaveBeenLastCalledWith(
-                expect.arrayContaining([FilterKey.PeopleFilter, FilterKey.MentionsFilter]),
-            );
-        });
-
         it("should return the current active primary filter", async () => {
             // Let's say that the user's preferred sorting is alphabetic
             mockAndCreateRooms();
@@ -162,8 +127,8 @@ describe("RoomListViewModel", () => {
             expect(vm.current.activePrimaryFilter).toEqual(vm.current.primaryFilters[i]);
         });
 
-        it("should remove any active primary filters when secondary filter is changed", async () => {
-            const { fn } = mockAndCreateRooms();
+        it("should remove all filters when active space is changed", async () => {
+            mockAndCreateRooms();
             const { result: vm } = renderHook(() => useRoomListViewModel());
 
             // Let's first toggle the People filter
@@ -173,119 +138,11 @@ describe("RoomListViewModel", () => {
             });
             expect(vm.current.primaryFilters[i].active).toEqual(true);
 
-            // Let's say we toggle the mentions secondary filter
-            act(() => {
-                vm.current.activateSecondaryFilter(SecondaryFilters.MentionsOnly);
-            });
+            // Simulate a space change
+            await act(() => SpaceStore.instance.emit(UPDATE_SELECTED_SPACE));
 
             // Primary filer should have been unapplied
-            expect(vm.current.primaryFilters[i].active).toEqual(false);
-
-            // RLS call must include only the secondary filter
-            expect(fn).toHaveBeenLastCalledWith(expect.arrayContaining([FilterKey.MentionsFilter]));
-        });
-
-        const testcases: Array<[string, { secondary: SecondaryFilters; filterKey: FilterKey }, string]> = [
-            [
-                "Mentions only",
-                { secondary: SecondaryFilters.MentionsOnly, filterKey: FilterKey.MentionsFilter },
-                "Unread",
-            ],
-            ["Invites only", { secondary: SecondaryFilters.InvitesOnly, filterKey: FilterKey.InvitesFilter }, "Unread"],
-            [
-                "Invites only",
-                { secondary: SecondaryFilters.InvitesOnly, filterKey: FilterKey.InvitesFilter },
-                "Favourites",
-            ],
-            [
-                "Low priority",
-                { secondary: SecondaryFilters.LowPriority, filterKey: FilterKey.LowPriorityFilter },
-                "Favourites",
-            ],
-        ];
-
-        describe.each(testcases)("For secondary filter: %s", (secondaryFilterName, secondary, primaryFilterName) => {
-            it(`should unapply incompatible primary filter that is already active: ${primaryFilterName}`, () => {
-                const { fn } = mockAndCreateRooms();
-                const { result: vm } = renderHook(() => useRoomListViewModel());
-
-                // Apply the primary filter
-                const i = vm.current.primaryFilters.findIndex((f) => f.name === primaryFilterName);
-                act(() => {
-                    vm.current.primaryFilters[i].toggle();
-                });
-
-                // Apply the secondary filter
-                act(() => {
-                    vm.current.activateSecondaryFilter(secondary.secondary);
-                });
-
-                // RLS call should only include the secondary filter
-                expect(fn).toHaveBeenLastCalledWith([secondary.filterKey]);
-                // Primary filter should have been unapplied
-                expect(vm.current.primaryFilters[i].active).toEqual(false);
-            });
-
-            it(`should hide incompatible primary filter: ${primaryFilterName}`, () => {
-                mockAndCreateRooms();
-                const { result: vm } = renderHook(() => useRoomListViewModel());
-
-                // Apply the secondary filter
-                act(() => {
-                    vm.current.activateSecondaryFilter(secondary.secondary);
-                });
-
-                // Incompatible primary filter must be hidden
-                expect(vm.current.primaryFilters.find((f) => f.name === primaryFilterName)).toBeUndefined();
-            });
-        });
-    });
-
-    describe("Sorting", () => {
-        it("should change sort order", () => {
-            mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-
-            const resort = jest.spyOn(RoomListStoreV3.instance, "resort").mockImplementation(() => {});
-
-            // Change the sort option
-            act(() => {
-                vm.current.sort(SortOption.AToZ);
-            });
-
-            // Resort method in RLS must have been called
-            expect(resort).toHaveBeenCalledWith(SortingAlgorithm.Alphabetic);
-        });
-
-        it("should set activeSortOption based on value from settings", () => {
-            // Let's say that the user's preferred sorting is alphabetic
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => SortingAlgorithm.Alphabetic);
-
-            mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-            expect(vm.current.activeSortOption).toEqual(SortOption.AToZ);
-        });
-    });
-
-    describe("message preview toggle", () => {
-        it("should return shouldShowMessagePreview based on setting", () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => true);
-            mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-            expect(vm.current.shouldShowMessagePreview).toEqual(true);
-        });
-
-        it("should change setting on toggle", () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(() => true);
-            const fn = jest.spyOn(SettingsStore, "setValue").mockImplementation(async () => {});
-            mockAndCreateRooms();
-            const { result: vm } = renderHook(() => useRoomListViewModel());
-            expect(vm.current.shouldShowMessagePreview).toEqual(true);
-            act(() => {
-                vm.current.toggleMessagePreview();
-            });
-            expect(vm.current.shouldShowMessagePreview).toEqual(false);
-            expect(fn).toHaveBeenCalled();
+            expect(vm.current.activePrimaryFilter).toEqual(undefined);
         });
     });
 
@@ -322,6 +179,43 @@ describe("RoomListViewModel", () => {
             expect(vm.rooms[i].roomId).toEqual(roomId);
         }
 
+        it("active index is calculated with the last opened room in a space", () => {
+            // Let's say there's two spaces: !space1:matrix.org and !space2:matrix.org
+            // Let's also say that the current active space is !space1:matrix.org
+            let currentSpace = "!space1:matrix.org";
+            jest.spyOn(SpaceStore.instance, "activeSpace", "get").mockImplementation(() => currentSpace);
+
+            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];
+            // Let's say all rooms with even index are in space 2
+            const roomsInSpace2 = [...rooms].filter((_, i) => i % 2 === 0);
+            jest.spyOn(RoomListStoreV3.instance, "getSortedRoomsInActiveSpace").mockImplementation(() =>
+                currentSpace === "!space1:matrix.org" ? roomsInSpace1 : roomsInSpace2,
+            );
+
+            // Let's say that the room at index 4 is currently active
+            const roomId = rooms[4].roomId;
+            jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockImplementation(() => roomId);
+
+            const { result: vm } = renderHook(() => useRoomListViewModel());
+            expect(vm.current.activeIndex).toEqual(4);
+
+            // Let's say that space is changed to "!space2:matrix.org"
+            currentSpace = "!space2:matrix.org";
+            // Let's say that room[6] is active in space 2
+            const activeRoomIdInSpace2 = rooms[6].roomId;
+            jest.spyOn(SpaceStore.instance, "getLastSelectedRoomIdForSpace").mockImplementation(
+                () => activeRoomIdInSpace2,
+            );
+            act(() => {
+                RoomListStoreV3.instance.emit(LISTS_UPDATE_EVENT);
+            });
+
+            // Active index should be 3 even without the room change event.
+            expectActiveRoom(vm.current, 3, activeRoomIdInSpace2);
+        });
+
         it("active room and active index are retained on order change", () => {
             const { rooms } = mockAndCreateRooms();
 
diff --git a/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts b/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts
new file mode 100644
index 0000000000..c82f9aa87d
--- /dev/null
+++ b/test/unit-tests/components/viewmodels/roomlist/useRoomListNavigation-test.ts
@@ -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 { renderHook } from "jest-matrix-react";
+import { type Room } from "matrix-js-sdk/src/matrix";
+import { waitFor } from "@testing-library/dom";
+
+import { SdkContextClass } from "../../../../../src/contexts/SDKContext";
+import dispatcher from "../../../../../src/dispatcher/dispatcher";
+import { mkStubRoom, stubClient } from "../../../../test-utils";
+import { useRoomListNavigation } from "../../../../../src/components/viewmodels/roomlist/useRoomListNavigation";
+import { Action } from "../../../../../src/dispatcher/actions";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+import { RoomNotificationStateStore } from "../../../../../src/stores/notifications/RoomNotificationStateStore";
+import { type RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
+
+describe("useRoomListNavigation", () => {
+    let rooms: Room[];
+
+    beforeEach(() => {
+        const matrixClient = stubClient();
+        rooms = [
+            mkStubRoom("room1", "Room 1", matrixClient),
+            mkStubRoom("room2", "Room 2", matrixClient),
+            mkStubRoom("room3", "Room 3", matrixClient),
+        ];
+
+        DMRoomMap.makeShared(matrixClient);
+        jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+        jest.spyOn(dispatcher, "dispatch");
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it("should navigate to the next room based on delta", async () => {
+        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("room1");
+
+        renderHook(() => useRoomListNavigation(rooms));
+        dispatcher.dispatch({
+            action: Action.ViewRoomDelta,
+            delta: 1,
+            unread: false,
+        });
+
+        await waitFor(() =>
+            expect(dispatcher.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: "room2",
+                show_room_tile: true,
+                metricsTrigger: "WebKeyboardShortcut",
+                metricsViaKeyboard: true,
+            }),
+        );
+    });
+
+    it("should navigate to the previous room based on delta", async () => {
+        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("room2");
+
+        renderHook(() => useRoomListNavigation(rooms));
+        dispatcher.dispatch({
+            action: Action.ViewRoomDelta,
+            delta: -1,
+            unread: false,
+        });
+
+        await waitFor(() =>
+            expect(dispatcher.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: "room1",
+                show_room_tile: true,
+                metricsTrigger: "WebKeyboardShortcut",
+                metricsViaKeyboard: true,
+            }),
+        );
+    });
+
+    it("should wrap around to the first room when navigating past the last room", async () => {
+        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("room3");
+
+        renderHook(() => useRoomListNavigation(rooms));
+        dispatcher.dispatch({
+            action: Action.ViewRoomDelta,
+            delta: 1,
+            unread: false,
+        });
+
+        await waitFor(() =>
+            expect(dispatcher.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: "room1",
+                show_room_tile: true,
+                metricsTrigger: "WebKeyboardShortcut",
+                metricsViaKeyboard: true,
+            }),
+        );
+    });
+
+    it("should wrap around to the last room when navigating before the first room", async () => {
+        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("room1");
+
+        renderHook(() => useRoomListNavigation(rooms));
+        dispatcher.dispatch({
+            action: Action.ViewRoomDelta,
+            delta: -1,
+            unread: false,
+        });
+
+        await waitFor(() =>
+            expect(dispatcher.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: "room3",
+                show_room_tile: true,
+                metricsTrigger: "WebKeyboardShortcut",
+                metricsViaKeyboard: true,
+            }),
+        );
+    });
+
+    it("should filter rooms to only unread when unread=true", async () => {
+        jest.spyOn(SdkContextClass.instance.roomViewStore, "getRoomId").mockReturnValue("room1");
+        jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockImplementation(
+            (room) =>
+                ({
+                    isUnread: room.roomId !== "room1",
+                }) as RoomNotificationState,
+        );
+
+        renderHook(() => useRoomListNavigation(rooms));
+
+        dispatcher.dispatch({
+            action: Action.ViewRoomDelta,
+            delta: 1,
+            unread: true,
+        });
+
+        await waitFor(() =>
+            expect(dispatcher.dispatch).toHaveBeenCalledWith({
+                action: Action.ViewRoom,
+                room_id: "room2",
+                show_room_tile: true,
+                metricsTrigger: "WebKeyboardShortcut",
+                metricsViaKeyboard: true,
+            }),
+        );
+    });
+});
diff --git a/test/unit-tests/components/viewmodels/roomlist/utils-test.ts b/test/unit-tests/components/viewmodels/roomlist/utils-test.ts
index 1fd4fc1b4a..322d2a5cc6 100644
--- a/test/unit-tests/components/viewmodels/roomlist/utils-test.ts
+++ b/test/unit-tests/components/viewmodels/roomlist/utils-test.ts
@@ -10,7 +10,11 @@ import { mocked } from "jest-mock";
 import type { MatrixClient, Room, RoomState } from "matrix-js-sdk/src/matrix";
 import { createTestClient, mkStubRoom } from "../../../../test-utils";
 import { shouldShowComponent } from "../../../../../src/customisations/helpers/UIComponents";
-import { hasCreateRoomRights, createRoom } from "../../../../../src/components/viewmodels/roomlist/utils";
+import {
+    hasCreateRoomRights,
+    createRoom,
+    hasAccessToNotificationMenu,
+} from "../../../../../src/components/viewmodels/roomlist/utils";
 import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
 import { Action } from "../../../../../src/dispatcher/actions";
 import { showCreateNewRoom } from "../../../../../src/utils/space";
@@ -66,4 +70,13 @@ describe("utils", () => {
             expect(hasCreateRoomRights(matrixClient)).toBe(true);
         });
     });
+
+    it("hasAccessToNotificationMenu", () => {
+        mocked(shouldShowComponent).mockReturnValue(true);
+        const room = mkStubRoom("roomId", "roomName", matrixClient);
+        const isGuest = false;
+        const isArchived = false;
+
+        expect(hasAccessToNotificationMenu(room, isGuest, isArchived)).toBe(true);
+    });
 });
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 68333d0fea..d0132c7317 100644
--- a/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts
+++ b/test/unit-tests/components/viewmodels/settings/encryption/KeyStoragePanelViewModel-test.ts
@@ -87,5 +87,8 @@ describe("KeyStoragePanelViewModel", () => {
         await result.current.setEnabled(false);
 
         expect(mocked(matrixClient.getCrypto()!.disableKeyStorage)).toHaveBeenCalled();
+        expect(mocked(matrixClient.setAccountData)).toHaveBeenCalledWith("m.org.matrix.custom.backup_disabled", {
+            disabled: true,
+        });
     });
 });
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 a84ecb1e16..243fea38b2 100644
--- a/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx
+++ b/test/unit-tests/components/views/audio_messages/RecordingPlayback-test.tsx
@@ -65,7 +65,7 @@ describe("<RecordingPlayback />", () => {
     beforeEach(() => {
         jest.spyOn(logger, "error").mockRestore();
         mockAudioBuffer.getChannelData.mockClear().mockReturnValue(mockChannelData);
-        mockAudioContext.decodeAudioData.mockReset().mockImplementation((_b, callback) => callback(mockAudioBuffer));
+        mockAudioContext.decodeAudioData.mockReset().mockResolvedValue(mockAudioBuffer);
         mocked(createAudioContext).mockReturnValue(mockAudioContext as unknown as AudioContext);
     });
 
diff --git a/test/unit-tests/components/views/auth/InteractiveAuthEntryComponents-test.tsx b/test/unit-tests/components/views/auth/InteractiveAuthEntryComponents-test.tsx
index 4768eed4dc..485f8e077b 100644
--- a/test/unit-tests/components/views/auth/InteractiveAuthEntryComponents-test.tsx
+++ b/test/unit-tests/components/views/auth/InteractiveAuthEntryComponents-test.tsx
@@ -87,7 +87,7 @@ describe("<MasUnlockCrossSigningAuthEntry/>", () => {
         const spy = jest.spyOn(global.window, "open");
         renderAuth();
 
-        fireEvent.click(screen.getByRole("button", { name: "Go to your account" }));
+        fireEvent.click(screen.getByRole("button", { name: "Continue to account" }));
         expect(spy).toHaveBeenCalledWith("https://example.com", "_blank");
     });
 
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 50a16c316d..17f61abcbb 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
@@ -35,15 +35,42 @@ exports[`<EmailIdentityAuthEntry/> should render 1`] = `
 
 exports[`<MasUnlockCrossSigningAuthEntry/> should render 1`] = `
 <div>
-  <div>
-    <p
-      class="_typography_6v6n8_153 _font-body-md-regular_6v6n8_50"
-    >
-      Reset your identity through your account provider and then come back and click “Retry”.
-    </p>
+  <div
+    class="mx_EncryptionCard"
+  >
     <div
-      class="mx_Flex"
-      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;"
+      class="mx_EncryptionCard_header"
+    >
+      <div
+        class="_content_o77nw_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="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>
+      <h2
+        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+      >
+        Go to your account to reset your identity
+      </h2>
+      <span>
+        You're about to go to your matrix.org account to reset your identity. Once you have completed reset on your account, please return here and click Retry.
+      </span>
+    </div>
+    <div
+      class="mx_EncryptionCard_buttons"
     >
       <button
         class="_button_vczzf_8 mx_Dialog_nonDialogButton _has-icon_vczzf_57"
@@ -67,11 +94,11 @@ exports[`<MasUnlockCrossSigningAuthEntry/> should render 1`] = `
             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>
-        Go to your account
+        Continue to account
       </button>
       <button
         class="_button_vczzf_8 mx_Dialog_nonDialogButton"
-        data-kind="secondary"
+        data-kind="tertiary"
         data-size="lg"
         role="button"
         tabindex="0"
diff --git a/test/unit-tests/components/views/avatars/DecoratedRoomAvatar-test.tsx b/test/unit-tests/components/views/avatars/DecoratedRoomAvatar-test.tsx
index f4a386f9cb..e41f068d21 100644
--- a/test/unit-tests/components/views/avatars/DecoratedRoomAvatar-test.tsx
+++ b/test/unit-tests/components/views/avatars/DecoratedRoomAvatar-test.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { render, waitFor } from "jest-matrix-react";
 import { mocked } from "jest-mock";
-import { JoinRule, type MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import { JoinRule, type MatrixClient, PendingEventOrdering, Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import React from "react";
 import userEvent from "@testing-library/user-event";
 
@@ -79,6 +79,7 @@ describe("DecoratedRoomAvatar", () => {
         } as unknown as DMRoomMap;
         jest.spyOn(DMRoomMap, "shared").mockReturnValue(dmRoomMap);
         jest.spyOn(DecoratedRoomAvatar.prototype as any, "getPresenceIcon").mockImplementation(() => "ONLINE");
+        jest.spyOn(room, "getMember").mockReturnValue(new RoomMember(room.roomId, DM_USER_ID));
 
         const { container, asFragment } = renderComponent();
 
diff --git a/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx b/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx
index 615e24fa69..1c8db39040 100644
--- a/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx
+++ b/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx
@@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { render } from "jest-matrix-react";
-import { type MatrixClient, Room } from "matrix-js-sdk/src/matrix";
+import { EventType, type MatrixClient, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import { mocked } from "jest-mock";
 
 import RoomAvatar from "../../../../../src/components/views/avatars/RoomAvatar";
@@ -17,6 +17,7 @@ import DMRoomMap from "../../../../../src/utils/DMRoomMap";
 import { LocalRoom } from "../../../../../src/models/LocalRoom";
 import * as AvatarModule from "../../../../../src/Avatar";
 import { DirectoryMember } from "../../../../../src/utils/direct-messages";
+import { MediaPreviewValue } from "../../../../../src/@types/media_preview";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../../../src/settings/SettingLevel";
 
@@ -37,18 +38,18 @@ describe("RoomAvatar", () => {
     });
 
     afterAll(() => {
+        SettingsStore.setValue(
+            "mediaPreviewConfig",
+            null,
+            SettingLevel.ACCOUNT,
+            SettingsStore.getDefaultValue("mediaPreviewConfig"),
+        );
         jest.restoreAllMocks();
     });
 
     afterEach(() => {
         mocked(DMRoomMap.shared().getUserIdForRoomId).mockReset();
         mocked(AvatarModule.defaultAvatarUrlForString).mockClear();
-        SettingsStore.setValue(
-            "showAvatarsOnInvites",
-            null,
-            SettingLevel.ACCOUNT,
-            SettingsStore.getDefaultValue("showAvatarsOnInvites"),
-        );
     });
 
     it("should render as expected for a Room", () => {
@@ -60,6 +61,7 @@ describe("RoomAvatar", () => {
     it("should render as expected for a DM room", () => {
         const userId = "@dm_user@example.com";
         const room = new Room("!room:example.com", client, client.getSafeUserId());
+        room.getMember = jest.fn().mockImplementation(() => new RoomMember(room.roomId, userId));
         room.name = "DM room";
         mocked(DMRoomMap.shared().getUserIdForRoomId).mockReturnValue(userId);
         expect(render(<RoomAvatar room={room} />).container).toMatchSnapshot();
@@ -73,15 +75,27 @@ describe("RoomAvatar", () => {
         expect(render(<RoomAvatar room={localRoom} />).container).toMatchSnapshot();
     });
     it("should render an avatar for a room the user is invited to", () => {
-        SettingsStore.setValue("showAvatarsOnInvites", null, SettingLevel.ACCOUNT, true);
         const room = new Room("!room:example.com", client, client.getSafeUserId());
         jest.spyOn(room, "getMxcAvatarUrl").mockImplementation(() => "mxc://example.com/foobar");
         room.name = "test room";
         room.updateMyMembership("invite");
+        room.currentState.setStateEvents([
+            new MatrixEvent({
+                sender: "@sender:server",
+                room_id: room.roomId,
+                type: EventType.RoomAvatar,
+                state_key: "",
+                content: {
+                    url: "mxc://example.com/foobar",
+                },
+            }),
+        ]);
         expect(render(<RoomAvatar room={room} />).container).toMatchSnapshot();
     });
     it("should not render an invite avatar if the user has disabled it", () => {
-        SettingsStore.setValue("showAvatarsOnInvites", null, SettingLevel.ACCOUNT, false);
+        SettingsStore.setValue("mediaPreviewConfig", null, SettingLevel.ACCOUNT, {
+            invite_avatars: MediaPreviewValue.Off,
+        });
         const room = new Room("!room:example.com", client, client.getSafeUserId());
         room.name = "test room";
         room.updateMyMembership("invite");
diff --git a/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx b/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx
new file mode 100644
index 0000000000..00ab886b4f
--- /dev/null
+++ b/test/unit-tests/components/views/avatars/RoomAvatarView-test.tsx
@@ -0,0 +1,100 @@
+/*
+ * 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 { 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";
+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(),
+}));
+
+describe("<RoomAvatarView />", () => {
+    const matrixClient = stubClient();
+    const room = mkStubRoom("roomId", "roomName", matrixClient);
+
+    DMRoomMap.makeShared(matrixClient);
+    jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
+
+    let defaultValue: RoomAvatarViewState;
+
+    beforeEach(() => {
+        defaultValue = {
+            badgeDecoration: undefined,
+            presence: null,
+        };
+
+        mocked(useRoomAvatarViewModel).mockReturnValue(defaultValue);
+    });
+
+    it("should not render a decoration", () => {
+        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,
+            badgeDecoration: AvatarBadgeDecoration.VideoRoom,
+        });
+        const { asFragment } = render(<RoomAvatarView room={room} />);
+
+        expect(screen.getByLabelText("This room is a video room")).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should render a public room decoration", () => {
+        mocked(useRoomAvatarViewModel).mockReturnValue({
+            ...defaultValue,
+            badgeDecoration: AvatarBadgeDecoration.PublicRoom,
+        });
+        const { asFragment } = render(<RoomAvatarView room={room} />);
+
+        expect(screen.getByLabelText("This room is public")).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it.each([
+        { presence: Presence.Online, label: "Online" },
+        { presence: Presence.Offline, label: "Offline" },
+        { presence: Presence.Busy, label: "Busy" },
+        { presence: Presence.Away, label: "Away" },
+    ])("should render the $presence presence", ({ presence, label }) => {
+        mocked(useRoomAvatarViewModel).mockReturnValue({
+            ...defaultValue,
+            badgeDecoration: AvatarBadgeDecoration.Presence,
+            presence,
+        });
+        const { asFragment } = render(<RoomAvatarView room={room} />);
+
+        expect(screen.getByLabelText(label)).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+});
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 07362b63be..5250682916 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
@@ -16,7 +16,7 @@ exports[`DecoratedRoomAvatar shows an avatar with globe icon and tooltip for pub
       r
     </span>
     <div
-      aria-labelledby=":r0:"
+      aria-labelledby="«r0»"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_globe"
       tabindex="0"
     />
@@ -40,7 +40,7 @@ exports[`DecoratedRoomAvatar shows the presence indicator in a DM room that also
       r
     </span>
     <div
-      aria-labelledby=":r6:"
+      aria-labelledby="«r6»"
       class="mx_DecoratedRoomAvatar_icon mx_DecoratedRoomAvatar_icon_online"
       tabindex="0"
     />
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
new file mode 100644
index 0000000000..9aeb54ab0f
--- /dev/null
+++ b/test/unit-tests/components/views/avatars/__snapshots__/RoomAvatarView-test.tsx.snap
@@ -0,0 +1,375 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RoomAvatarView /> should not render a decoration 1`] = `
+<DocumentFragment>
+  <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>
+</DocumentFragment>
+`;
+
+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"
+      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>
+    <svg
+      aria-label="This is a low priority 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="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_1qbcf_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_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>
+    <svg
+      aria-label="This room is public"
+      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 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>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render a video 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"
+      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>
+    <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>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render the AWAY presence 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomAvatarView"
+  >
+    <span
+      aria-label="Avatar"
+      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
+      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>
+    <svg
+      aria-label="Away"
+      class="mx_RoomAvatarView_PresenceDecoration"
+      color="var(--cpd-color-icon-quaternary)"
+      fill="currentColor"
+      height="8px"
+      viewBox="0 0 8 8"
+      width="8px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        clip-path="url(#a)"
+      >
+        <path
+          d="M8 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0"
+        />
+      </g>
+      <defs>
+        <clippath
+          id="a"
+        >
+          <path
+            d="M0 0h8v8H0z"
+          />
+        </clippath>
+      </defs>
+    </svg>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render the BUSY presence 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomAvatarView"
+  >
+    <span
+      aria-label="Avatar"
+      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
+      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>
+    <svg
+      aria-label="Busy"
+      class="mx_RoomAvatarView_PresenceDecoration"
+      color="var(--cpd-color-icon-tertiary)"
+      fill="currentColor"
+      height="8px"
+      viewBox="0 0 8 8"
+      width="8px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        clip-path="url(#a)"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M8 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0M5.435 6.048A2.5 2.5 0 0 1 1.687 3.05zm.914-1.19L2.648 1.897a2.5 2.5 0 0 1 3.701 2.961"
+          fill-rule="evenodd"
+        />
+      </g>
+      <defs>
+        <clippath
+          id="a"
+        >
+          <path
+            d="M0 0h8v8H0z"
+          />
+        </clippath>
+      </defs>
+    </svg>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render the OFFLINE presence 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomAvatarView"
+  >
+    <span
+      aria-label="Avatar"
+      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
+      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>
+    <svg
+      aria-label="Offline"
+      class="mx_RoomAvatarView_PresenceDecoration"
+      color="var(--cpd-color-icon-tertiary)"
+      fill="currentColor"
+      height="8px"
+      viewBox="0 0 8 8"
+      width="8px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        clip-path="url(#a)"
+      >
+        <path
+          clip-rule="evenodd"
+          d="M4 6.5a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5M4 8a4 4 0 1 0 0-8 4 4 0 0 0 0 8"
+          fill-rule="evenodd"
+        />
+      </g>
+      <defs>
+        <clippath
+          id="a"
+        >
+          <path
+            d="M0 0h8v8H0z"
+          />
+        </clippath>
+      </defs>
+    </svg>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomAvatarView /> should render the ONLINE presence 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_RoomAvatarView"
+  >
+    <span
+      aria-label="Avatar"
+      class="_avatar_1qbcf_8 mx_BaseAvatar mx_RoomAvatarView_RoomAvatar mx_RoomAvatarView_RoomAvatar_presence"
+      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>
+    <svg
+      aria-label="Online"
+      class="mx_RoomAvatarView_PresenceDecoration"
+      color="var(--cpd-color-icon-accent-primary)"
+      fill="currentColor"
+      height="8px"
+      viewBox="0 0 8 8"
+      width="8px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g
+        clip-path="url(#a)"
+      >
+        <path
+          d="M8 4a4 4 0 1 1-8 0 4 4 0 0 1 8 0"
+        />
+      </g>
+      <defs>
+        <clippath
+          id="a"
+        >
+          <path
+            d="M0 0h8v8H0z"
+          />
+        </clippath>
+      </defs>
+    </svg>
+  </div>
+</DocumentFragment>
+`;
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 a66841e0d1..07f947d6d6 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
@@ -7,7 +7,7 @@ exports[`WithPresenceIndicator renders presence indicator with tooltip for DM ro
   >
     <span />
     <div
-      aria-labelledby=":r0:"
+      aria-labelledby="«r0»"
       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="«r6»"
       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="«rc»"
       class="mx_WithPresenceIndicator_icon mx_WithPresenceIndicator_icon_away"
       style="width: 32px; height: 32px;"
       tabindex="0"
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 ad27050370..234b32911d 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
@@ -32,7 +32,7 @@ exports[`<BeaconListItem /> when a beacon is live and has locations renders beac
           class="mx_BeaconListItem_interactions"
         >
           <a
-            aria-labelledby=":r0:"
+            aria-labelledby="«r0»"
             data-testid="open-location-in-osm"
             href="https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41"
             rel="noreferrer noopener"
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 27be462729..b9364bb6db 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
@@ -72,7 +72,7 @@ exports[`<DialogSidebar /> renders sidebar correctly with beacons 1`] = `
               class="mx_BeaconListItem_interactions"
             >
               <a
-                aria-labelledby=":r8:"
+                aria-labelledby="«r8»"
                 data-testid="open-location-in-osm"
                 href="https://www.openstreetmap.org/?mlat=51&mlon=41#map=16/51/41"
                 rel="noreferrer noopener"
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 c3e25bc86a..09500389af 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
@@ -3,7 +3,7 @@
 exports[`<ShareLatestLocation /> renders share buttons when there is a location 1`] = `
 <DocumentFragment>
   <a
-    aria-labelledby=":r0:"
+    aria-labelledby="«r0»"
     data-testid="open-location-in-osm"
     href="https://www.openstreetmap.org/?mlat=51&mlon=42#map=16/51/42"
     rel="noreferrer noopener"
diff --git a/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx b/test/unit-tests/components/views/dialogs/AccessSecretStorageDialog-test.tsx
index e0320b2908..23fa06720c 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 = (placeholder = "Recovery Key"): void => {
-        act(() => {
-            fireEvent.change(screen.getByPlaceholderText(placeholder), {
+    const enterRecoveryKey = async (valueToEnter: string = recoveryKey): Promise<void> => {
+        await act(async () => {
+            fireEvent.change(screen.getByRole("textbox"), {
                 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,19 +67,19 @@ describe("AccessSecretStorageDialog", () => {
         renderComponent({ onFinished, checkPrivateKey });
 
         // check that the input field is focused
-        expect(screen.getByPlaceholderText("Recovery Key")).toHaveFocus();
+        expect(screen.getByRole("textbox")).toHaveFocus();
 
         await enterRecoveryKey();
         await submitDialog();
 
-        expect(screen.getByText("Looks good!")).toBeInTheDocument();
+        expect(screen.getByText("Continue")).not.toHaveAttribute("aria-disabled", "true");
         expect(checkPrivateKey).toHaveBeenCalledWith({ recoveryKey });
         expect(onFinished).toHaveBeenCalledWith({ recoveryKey });
     });
 
     it("Notifies the user if they input an invalid Recovery Key", async () => {
         const onFinished = jest.fn();
-        const checkPrivateKey = jest.fn().mockResolvedValue(true);
+        const checkPrivateKey = jest.fn().mockResolvedValue(false);
         renderComponent({ onFinished, checkPrivateKey });
 
         jest.spyOn(mockClient.secretStorage, "checkKey").mockImplementation(() => {
@@ -89,8 +89,8 @@ describe("AccessSecretStorageDialog", () => {
         await enterRecoveryKey();
         await submitDialog();
 
-        expect(screen.getByText("Continue")).toBeDisabled();
-        expect(screen.getByText("Invalid Recovery Key")).toBeInTheDocument();
+        expect(screen.getByText("The recovery key you entered is not correct.")).toBeInTheDocument();
+        expect(screen.getByText("Continue")).toHaveAttribute("aria-disabled", "true");
     });
 
     it("Notifies the user if they input an invalid passphrase", async function () {
@@ -110,46 +110,28 @@ describe("AccessSecretStorageDialog", () => {
         const checkPrivateKey = jest.fn().mockResolvedValue(false);
         renderComponent({ checkPrivateKey, keyInfo });
 
-        await enterRecoveryKey("Security Phrase");
-        expect(screen.getByPlaceholderText("Security Phrase")).toHaveValue(recoveryKey);
-        await submitDialog();
+        await enterRecoveryKey();
+        expect(screen.getByRole("textbox")).toHaveValue(recoveryKey);
 
-        await expect(
-            screen.findByText(
-                "👎 Unable to access secret storage. Please verify that you entered the correct Security Phrase.",
-            ),
-        ).resolves.toBeInTheDocument();
-
-        expect(screen.getByPlaceholderText("Security Phrase")).toHaveFocus();
+        await expect(screen.findByText("The recovery key you entered is not correct.")).resolves.toBeInTheDocument();
+        expect(screen.getByText("Continue")).toHaveAttribute("aria-disabled", "true");
     });
 
-    it("Can reset secret storage", async () => {
-        jest.spyOn(mockClient.secretStorage, "checkKey").mockResolvedValue(true);
+    it("Clears the 'invalid recovery key' notice when the input is cleared", async function () {
+        renderComponent({ onFinished: () => {}, checkPrivateKey: () => false });
 
-        const onFinished = jest.fn();
-        const checkPrivateKey = jest.fn().mockResolvedValue(true);
-        renderComponent({ onFinished, checkPrivateKey });
+        jest.spyOn(mockClient.secretStorage, "checkKey").mockRejectedValue(new Error("invalid key"));
 
-        await userEvent.click(screen.getByText("Reset all"), { delay: null });
+        // First, enter the wrong recovery key
+        await enterRecoveryKey();
+        expect(screen.getByText("The recovery key you entered is not correct.")).toBeInTheDocument();
 
-        // It will prompt the user to confirm resetting
-        expect(screen.getByText("Reset everything")).toBeInTheDocument();
-        await userEvent.click(screen.getByText("Reset"), { delay: null });
-
-        // Then it will prompt the user to create a key/passphrase
-        await screen.findByText("Set up Secure Backup");
-        document.execCommand = jest.fn().mockReturnValue(true);
-        jest.spyOn(mockClient.getCrypto()!, "createRecoveryKeyFromPassphrase").mockResolvedValue({
-            privateKey: new Uint8Array(),
-            encodedPrivateKey: recoveryKey,
-        });
-        screen.getByRole("button", { name: "Continue" }).click();
-
-        await screen.findByText(/Save your Recovery Key/);
-        screen.getByRole("button", { name: "Copy" }).click();
-        await screen.findByText("Copied!");
-        screen.getByRole("button", { name: "Continue" }).click();
-
-        await screen.findByText("Secure Backup successful");
+        // 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..e8737fe88d
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/BaseDialog-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 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();
+        render(<BaseDialog onFinished={onFinished} />);
+        await userEvent.keyboard("{Escape}");
+        expect(onFinished).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/ConfirmKeyStorageOffDialog-test.tsx b/test/unit-tests/components/views/dialogs/ConfirmKeyStorageOffDialog-test.tsx
new file mode 100644
index 0000000000..a27f784c46
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/ConfirmKeyStorageOffDialog-test.tsx
@@ -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 React from "react";
+import { render } from "jest-matrix-react";
+
+import ConfirmKeyStorageOffDialog from "../../../../../src/components/views/dialogs/ConfirmKeyStorageOffDialog";
+
+describe("ConfirmKeyStorageOffDialog", () => {
+    beforeEach(() => {
+        jest.resetAllMocks();
+    });
+
+    it("renders", () => {
+        const dialog = render(<ConfirmKeyStorageOffDialog onFinished={jest.fn()} />);
+        expect(dialog.asFragment()).toMatchSnapshot();
+    });
+
+    it("calls onFinished with dismissed=true if we dismiss", () => {
+        const onFinished = jest.fn();
+        const dialog = render(<ConfirmKeyStorageOffDialog onFinished={onFinished} />);
+
+        dialog.getByRole("button", { name: "Yes, dismiss" }).click();
+
+        expect(onFinished).toHaveBeenCalledWith(true);
+    });
+
+    it("calls onFinished with dismissed=true if we continue", () => {
+        const onFinished = jest.fn();
+        const dialog = render(<ConfirmKeyStorageOffDialog onFinished={onFinished} />);
+
+        dialog.getByRole("button", { name: "Go to Settings" }).click();
+
+        expect(onFinished).toHaveBeenCalledWith(false);
+    });
+});
diff --git a/test/unit-tests/components/views/dialogs/ConfirmRejectInviteDialog-test.tsx b/test/unit-tests/components/views/dialogs/ConfirmRejectInviteDialog-test.tsx
new file mode 100644
index 0000000000..573cfa76fe
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/ConfirmRejectInviteDialog-test.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 { render } from "jest-matrix-react";
+import userEvent from "@testing-library/user-event";
+import React from "react";
+
+import SdkConfig from "../../../../../src/SdkConfig";
+import { DeclineAndBlockInviteDialog } from "../../../../../src/components/views/dialogs/DeclineAndBlockInviteDialog";
+
+describe("ConfirmRejectInviteDialog", () => {
+    const onFinished: jest.Mock<any, any> = jest.fn();
+
+    const MY_ROOM_NAME = "foo";
+
+    beforeEach(() => {
+        jest.resetAllMocks();
+    });
+
+    afterEach(() => {
+        SdkConfig.reset();
+    });
+
+    it("can close the dialog", async () => {
+        const { getByTestId } = render(<DeclineAndBlockInviteDialog onFinished={onFinished} roomName={MY_ROOM_NAME} />);
+        await userEvent.click(getByTestId("dialog-cancel-button"));
+        expect(onFinished).toHaveBeenCalledWith(false, false, false);
+    });
+
+    it("can reject with options selected", async () => {
+        const { container, getByLabelText, getByRole } = render(
+            <DeclineAndBlockInviteDialog onFinished={onFinished} roomName={MY_ROOM_NAME} />,
+        );
+        await userEvent.click(getByRole("switch", { name: "Ignore user" }));
+        await userEvent.click(getByRole("switch", { name: "Report room" }));
+        await userEvent.type(getByLabelText("Reason"), "I want to report this room");
+        expect(container).toMatchSnapshot();
+        await userEvent.click(getByRole("button", { name: "Decline invite" }));
+        expect(onFinished).toHaveBeenCalledWith(true, true, "I want to report this room");
+    });
+    it("can reject without a reason", async () => {
+        const { getByRole } = render(<DeclineAndBlockInviteDialog onFinished={onFinished} roomName={MY_ROOM_NAME} />);
+        await userEvent.click(getByRole("switch", { name: "Ignore user" }));
+        await userEvent.click(getByRole("switch", { name: "Report room" }));
+        await userEvent.click(getByRole("button", { name: "Decline invite" }));
+        expect(onFinished).toHaveBeenCalledWith(true, true, "");
+    });
+});
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..0b710bec46
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/ManualDeviceKeyVerificationDialog-test.tsx
@@ -0,0 +1,191 @@
+/*
+ * 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 { stubClient } from "../../../../test-utils";
+import { ManualDeviceKeyVerificationDialog } from "../../../../../src/components/views/dialogs/ManualDeviceKeyVerificationDialog";
+import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
+
+describe("ManualDeviceKeyVerificationDialog", () => {
+    let mockClient: MatrixClient;
+
+    function renderDialog(onFinished: (confirm: boolean) => void) {
+        return render(
+            <MatrixClientContext.Provider value={mockClient}>
+                <ManualDeviceKeyVerificationDialog onFinished={onFinished} />
+            </MatrixClientContext.Provider>,
+        );
+    }
+
+    beforeEach(() => {
+        mockClient = stubClient();
+        mockExistingDevices();
+    });
+
+    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
+        expect(screen.getByText("Failed to verify 'VERIFIED_DEVICEID': This device is already verified")).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/ReportRoomDialog-test.tsx b/test/unit-tests/components/views/dialogs/ReportRoomDialog-test.tsx
index 27ec86e449..2357e341a1 100644
--- a/test/unit-tests/components/views/dialogs/ReportRoomDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/ReportRoomDialog-test.tsx
@@ -14,6 +14,7 @@ import SdkConfig from "../../../../../src/SdkConfig";
 import { stubClient } from "../../../../test-utils";
 
 const ROOM_ID = "!foo:bar";
+const REASON = "This room is bad!";
 
 describe("ReportRoomDialog", () => {
     const onFinished: jest.Mock<any, any> = jest.fn();
@@ -48,19 +49,24 @@ This doesn't actually go **anywhere**.`,
         expect(container).toMatchSnapshot();
     });
 
-    it("can submit a report", async () => {
-        const REASON = "This room is bad!";
-        const { getByLabelText, getByText, getByRole } = render(
-            <ReportRoomDialog roomId={ROOM_ID} onFinished={onFinished} />,
-        );
+    it("can submit a report without leaving the room", async () => {
+        const { getByLabelText, getByRole } = render(<ReportRoomDialog roomId={ROOM_ID} onFinished={onFinished} />);
 
-        await userEvent.type(getByLabelText("Reason"), REASON);
+        await userEvent.type(getByLabelText("Describe the reason"), REASON);
         await userEvent.click(getByRole("button", { name: "Send report" }));
 
         expect(reportRoom).toHaveBeenCalledWith(ROOM_ID, REASON);
-        expect(getByText("Your report was sent.")).toBeInTheDocument();
+        expect(onFinished).toHaveBeenCalledWith(false);
+    });
 
-        await userEvent.click(getByRole("button", { name: "Close dialog" }));
+    it("can submit a report and leave the room", async () => {
+        const { getByLabelText, getByRole } = render(<ReportRoomDialog roomId={ROOM_ID} onFinished={onFinished} />);
+
+        await userEvent.type(getByLabelText("Describe the reason"), REASON);
+        await userEvent.click(getByRole("switch", { name: "Leave room" }));
+        await userEvent.click(getByRole("button", { name: "Send report" }));
+
+        expect(reportRoom).toHaveBeenCalledWith(ROOM_ID, REASON);
         expect(onFinished).toHaveBeenCalledWith(true);
     });
 });
diff --git a/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx b/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
index 76f342c8f6..1c343a30a7 100644
--- a/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
+++ b/test/unit-tests/components/views/dialogs/SpotlightDialog-test.tsx
@@ -353,12 +353,12 @@ describe("Spotlight Dialog", () => {
         });
 
         it("should find Rooms", () => {
-            expect(options).toHaveLength(4);
+            expect(options).toHaveLength(5);
             expect(options[0]!.innerHTML).toContain(testRoom.name);
         });
 
         it("should not find LocalRooms", () => {
-            expect(options).toHaveLength(4);
+            expect(options).toHaveLength(5);
             expect(options[0]!.innerHTML).not.toContain(testLocalRoom.name);
         });
     });
@@ -648,4 +648,20 @@ describe("Spotlight Dialog", () => {
             });
         });
     });
+
+    it("should allow jumping into message search", async () => {
+        const onFinished = jest.fn();
+        render(<SpotlightDialog initialText="search term" onFinished={onFinished} />);
+        jest.advanceTimersByTime(200);
+        await flushPromisesWithFakeTimers();
+
+        fireEvent.click(screen.getByText("Messages"));
+
+        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith(
+            expect.objectContaining({
+                action: Action.FocusMessageSearch,
+                initialText: "search term",
+            }),
+        );
+    });
 });
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
new file mode 100644
index 0000000000..9e0def2569
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap
@@ -0,0 +1,82 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmKeyStorageOffDialog renders 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_EncryptionCard"
+  >
+    <div
+      class="mx_EncryptionCard_header"
+    >
+      <div
+        class="_content_o77nw_8 _destructive_o77nw_34"
+        data-size="large"
+      >
+        <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>
+      </div>
+      <h2
+        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+      >
+        Are you sure you want to keep key storage turned off?
+      </h2>
+    </div>
+    <span>
+      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"
+        rel="noreferrer noopener"
+        target="_blank"
+      >
+        Learn more 
+        <svg
+          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
+      class="mx_EncryptionCard_buttons"
+    >
+      <button
+        class="_button_vczzf_8"
+        data-kind="primary"
+        data-size="lg"
+        role="button"
+        tabindex="0"
+      >
+        Go to Settings
+      </button>
+      <button
+        class="_button_vczzf_8"
+        data-kind="secondary"
+        data-size="lg"
+        role="button"
+        tabindex="0"
+      >
+        Yes, dismiss
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
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
new file mode 100644
index 0000000000..c2ca9a5680
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ConfirmRejectInviteDialog-test.tsx.snap
@@ -0,0 +1,151 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfirmRejectInviteDialog can reject with options selected 1`] = `
+<div>
+  <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_DeclineAndBlockInviteDialog 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"
+      >
+        Decline invitation
+      </h1>
+    </div>
+    <form
+      class="_root_19upo_16"
+    >
+      <p>
+        Are you sure you want to decline the invitation to join "foo"?
+      </p>
+      <div
+        class="mx_SettingsFlag"
+      >
+        <span
+          class="mx_SettingsFlag_label"
+        >
+          <div
+            id="mx_LabelledToggleSwitch_«r7»"
+          >
+            Ignore user
+          </div>
+          <span
+            class="mx_Caption"
+            id="mx_LabelledToggleSwitch_«r7»_caption"
+          >
+            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"
+      >
+        <span
+          class="mx_SettingsFlag_label"
+        >
+          <div
+            id="mx_LabelledToggleSwitch_«r8»"
+          >
+            Report room
+          </div>
+          <span
+            class="mx_Caption"
+            id="mx_LabelledToggleSwitch_«r8»_caption"
+          >
+            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
+        aria-disabled="false"
+        class="_field_19upo_26"
+      >
+        <label
+          class="_label_19upo_59"
+          for="mx_DeclineAndBlockInviteDialog_reason"
+        >
+          Reason
+        </label>
+        <textarea
+          class="mx_RoomReportTextArea"
+          id="mx_DeclineAndBlockInviteDialog_reason"
+          placeholder="Describe the reason for reporting the room."
+          rows="5"
+        >
+          I want to report this room
+        </textarea>
+      </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 danger"
+            data-testid="dialog-primary-button"
+            type="button"
+          >
+            Decline invite
+          </button>
+        </span>
+      </div>
+    </form>
+    <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"
+  />
+</div>
+`;
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 b468763bbe..2342bab71d 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
@@ -198,7 +198,7 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r4:"
+              for="radix-«r4»"
             >
               Element Call URL
             </label>
@@ -207,7 +207,7 @@ exports[`DevtoolsDialog renders the devtools dialog 1`] = `
             >
               <input
                 class="_control_sqdq4_10"
-                id="radix-:r4:"
+                id="radix-«r4»"
                 name="input"
                 title=""
                 value=""
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 e71a92cb96..627cd1087a 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
@@ -75,7 +75,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
                   class="_container_1hel1_10"
                 >
                   <input
-                    aria-describedby=":r5:"
+                    aria-describedby="«r5»"
                     class="_input_1hel1_18"
                     id="checkbox_vY7Q4uEh9K"
                     type="checkbox"
@@ -125,7 +125,7 @@ exports[`<ManageRestrictedJoinRuleDialog /> should list spaces which are not par
                 </label>
                 <span
                   class="_message_19upo_85 _help-message_19upo_91"
-                  id=":r5:"
+                  id="«r5»"
                 >
                   0 members
                 </span>
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..75c2870126
--- /dev/null
+++ b/test/unit-tests/components/views/dialogs/__snapshots__/ManualDeviceKeyVerificationDialog-test.tsx.snap
@@ -0,0 +1,107 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+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"
+  >
+    <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__/ReportRoomDialog-test.tsx.snap b/test/unit-tests/components/views/dialogs/__snapshots__/ReportRoomDialog-test.tsx.snap
index a4ccaa8672..ec84104044 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
@@ -21,16 +21,33 @@ exports[`ReportRoomDialog displays admin message 1`] = `
         class="mx_Heading_h3 mx_Dialog_title"
         id="mx_BaseDialog_title"
       >
-        Report Room
+        Report room
       </h1>
     </div>
     <form
       class="_root_19upo_16"
       id="mx_ReportEventDialog"
     >
-      <p>
-        Report this room to your homeserver admin. This will send the room's unique ID, but if messages are encrypted, the administrator won't be able to read them or view shared files.
-      </p>
+      <div
+        class="_field_19upo_26"
+      >
+        <label
+          class="_label_19upo_59"
+          for="mx_ReportRoomDialog_reason"
+        >
+          Describe the reason
+        </label>
+        <textarea
+          id="mx_ReportRoomDialog_reason"
+          rows="5"
+        />
+        <span
+          class="_message_19upo_85 _help-message_19upo_91"
+          id="radix-«r8»"
+        >
+          Report this room to your account provider. If the messages are encrypted, your admin will not be able to read them.
+        </span>
+      </div>
       <p>
         <h1>
           You should know
@@ -48,19 +65,29 @@ exports[`ReportRoomDialog displays admin message 1`] = `
 
       </p>
       <div
-        class="_field_19upo_26"
+        class="mx_SettingsFlag"
       >
-        <label
-          class="_label_19upo_59"
-          for="mx_ReportRoomDialog_reason"
+        <span
+          class="mx_SettingsFlag_label"
         >
-          Reason
-        </label>
-        <textarea
-          id="mx_ReportRoomDialog_reason"
-          placeholder=" Reason for reporting..."
-          rows="5"
-        />
+          <div
+            id="mx_LabelledToggleSwitch_«r9»"
+          >
+            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"
+          />
+        </div>
       </div>
       <div
         class="mx_Dialog_buttons"
@@ -75,8 +102,9 @@ exports[`ReportRoomDialog displays admin message 1`] = `
             Cancel
           </button>
           <button
-            class="mx_Dialog_primary"
+            class="mx_Dialog_primary danger"
             data-testid="dialog-primary-button"
+            disabled=""
             type="button"
           >
             Send report
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 bdb0037cc4..633dd34fe0 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
@@ -50,7 +50,7 @@ exports[`<ServerPickerDialog /> should render dialog 1`] = `
           class="mx_StyledRadioButton_content"
         >
           <span
-            aria-labelledby=":r0:"
+            aria-labelledby="«r0»"
             class="mx_Login_underlinedServerName"
             tabindex="0"
           >
diff --git a/test/unit-tests/components/views/elements/PowerSelector-test.tsx b/test/unit-tests/components/views/elements/PowerSelector-test.tsx
index ef35cf75a0..f98b6c7446 100644
--- a/test/unit-tests/components/views/elements/PowerSelector-test.tsx
+++ b/test/unit-tests/components/views/elements/PowerSelector-test.tsx
@@ -8,7 +8,6 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { fireEvent, render, screen } from "jest-matrix-react";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import PowerSelector from "../../../../../src/components/views/elements/PowerSelector";
 
@@ -70,7 +69,7 @@ describe("<PowerSelector />", () => {
     });
 
     it("should reset when onChange promise rejects", async () => {
-        const deferred = defer<void>();
+        const deferred = Promise.withResolvers<void>();
         render(
             <PowerSelector
                 value={25}
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 3efbfdae6c..ccbdf5d8fb 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
@@ -4,6 +4,7 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
 <DocumentFragment>
   <aside
     class="mx_RightPanel"
+    data-testid="right-panel"
     id="mx_RightPanel"
   >
     <div
@@ -30,7 +31,7 @@ exports[`AppTile destroys non-persisted right panel widget on room change 1`] =
           />
         </div>
         <button
-          aria-labelledby=":r0:"
+          aria-labelledby="«r0»"
           class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
           data-testid="base-card-close-button"
           role="button"
@@ -336,8 +337,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="«r2j»"
+                aria-labelledby="«r2i»"
                 class="mx_TextWithTooltip_target mx_TextWithTooltip_target--helpIcon"
               >
                 <svg
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 2e923be862..62187854c3 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
@@ -3,7 +3,7 @@
 exports[`<FacePile /> renders with a tooltip 1`] = `
 <DocumentFragment>
   <div
-    aria-labelledby=":r0:"
+    aria-labelledby="«r0»"
     class="mx_AccessibleButton mx_FacePile"
     role="button"
     tabindex="0"
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 2d2541e361..438d3f0ecc 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
@@ -3,7 +3,7 @@
 exports[`InfoTooltip should show tooltip on hover 1`] = `
 <DocumentFragment>
   <div
-    aria-describedby=":r2:"
+    aria-describedby="«r2»"
     class="mx_InfoTooltip"
     tabindex="0"
   >
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 4b1c19626c..944cb23513 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
@@ -18,7 +18,7 @@ exports[`<LabelledCheckbox /> should render with byline of "this is a byline" 1`
             class="_container_1hel1_10"
           >
             <input
-              aria-describedby=":r4:"
+              aria-describedby="«r4»"
               checked=""
               class="_input_1hel1_18"
               id="checkbox_vY7Q4uEh9K"
@@ -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="«r4»"
           >
             this is a byline
           </span>
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 cd116d6d6e..4b396abded 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
@@ -3,8 +3,8 @@
 exports[`<RoomFacePile /> renders 1`] = `
 <DocumentFragment>
   <div
-    aria-describedby=":r1:"
-    aria-labelledby=":r0:"
+    aria-describedby="«r1»"
+    aria-labelledby="«r0»"
     class="mx_AccessibleButton mx_FacePile"
     role="button"
     tabindex="0"
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 565b199ab8..3103159bce 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
@@ -10,7 +10,7 @@ exports[`<SettingsField /> should render with the default label 1`] = `
     >
       <label
         class="_label_19upo_59"
-        for="radix-:r0:"
+        for="radix-«r0»"
       >
         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-«r0»"
           name="input"
           title=""
           value=""
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 6bf73720a5..3ab56061be 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
@@ -26,7 +26,7 @@ exports[`<LocationShareMenu /> with live location disabled goes to labs flag scr
       class="mx_SettingsFlag_label"
     >
       <div
-        id="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+        id="mx_LabelledToggleSwitch_«r0»"
       >
         Enable live location sharing
       </div>
@@ -34,7 +34,7 @@ exports[`<LocationShareMenu /> with live location disabled goes to labs flag scr
     <div
       aria-checked="false"
       aria-disabled="false"
-      aria-labelledby="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+      aria-labelledby="mx_LabelledToggleSwitch_«r0»"
       class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
       role="switch"
       tabindex="0"
diff --git a/test/unit-tests/components/views/messages/HideActionButton-test.tsx b/test/unit-tests/components/views/messages/HideActionButton-test.tsx
index 57e92b02b8..650afe69e6 100644
--- a/test/unit-tests/components/views/messages/HideActionButton-test.tsx
+++ b/test/unit-tests/components/views/messages/HideActionButton-test.tsx
@@ -8,20 +8,20 @@ Please see LICENSE files in the repository root for full details.
 
 import React from "react";
 import { fireEvent, render, screen } from "jest-matrix-react";
-import { MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import { HideActionButton } from "../../../../../src/components/views/messages/HideActionButton";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import { SettingLevel } from "../../../../../src/settings/SettingLevel";
 import type { Settings } from "../../../../../src/settings/Settings";
+import { MediaPreviewValue } from "../../../../../src/@types/media_preview";
+import { getMockClientWithEventEmitter, withClientContextRenderOptions } from "../../../../test-utils";
+import type { MockedObject } from "jest-mock";
 
-function mockSetting(
-    showImages: Settings["showImages"]["default"],
-    showMediaEventIds: Settings["showMediaEventIds"]["default"],
-) {
+function mockSetting(mediaPreviews: MediaPreviewValue, showMediaEventIds: Settings["showMediaEventIds"]["default"]) {
     jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
-        if (settingName === "showImages") {
-            return showImages;
+        if (settingName === "mediaPreviewConfig") {
+            return { media_previews: mediaPreviews, invite_avatars: MediaPreviewValue.Off };
         } else if (settingName === "showMediaEventIds") {
             return showMediaEventIds;
         }
@@ -29,8 +29,10 @@ function mockSetting(
     });
 }
 
+const EVENT_ID = "$foo:bar";
+
 const event = new MatrixEvent({
-    event_id: "$foo:bar",
+    event_id: EVENT_ID,
     room_id: "!room:id",
     sender: "@user:id",
     type: "m.room.message",
@@ -42,32 +44,38 @@ const event = new MatrixEvent({
 });
 
 describe("HideActionButton", () => {
+    let cli: MockedObject<MatrixClient>;
+    beforeEach(() => {
+        cli = getMockClientWithEventEmitter({
+            getRoom: jest.fn(),
+        });
+    });
     afterEach(() => {
         jest.restoreAllMocks();
     });
     it("should show button when event is visible by showMediaEventIds setting", async () => {
-        mockSetting(false, { "$foo:bar": true });
-        render(<HideActionButton mxEvent={event} />);
+        mockSetting(MediaPreviewValue.Off, { [EVENT_ID]: true });
+        render(<HideActionButton mxEvent={event} />, withClientContextRenderOptions(cli));
         expect(screen.getByRole("button")).toBeVisible();
     });
-    it("should show button when event is visible by showImages setting", async () => {
-        mockSetting(true, {});
-        render(<HideActionButton mxEvent={event} />);
+    it("should show button when event is visible by mediaPreviewConfig setting", async () => {
+        mockSetting(MediaPreviewValue.On, {});
+        render(<HideActionButton mxEvent={event} />, withClientContextRenderOptions(cli));
         expect(screen.getByRole("button")).toBeVisible();
     });
     it("should hide button when event is hidden by showMediaEventIds setting", async () => {
-        jest.spyOn(SettingsStore, "getValue").mockReturnValue({ "$foo:bar": false });
-        render(<HideActionButton mxEvent={event} />);
+        mockSetting(MediaPreviewValue.Off, { [EVENT_ID]: false });
+        render(<HideActionButton mxEvent={event} />, withClientContextRenderOptions(cli));
         expect(screen.queryByRole("button")).toBeNull();
     });
     it("should hide button when event is hidden by showImages setting", async () => {
-        mockSetting(false, {});
-        render(<HideActionButton mxEvent={event} />);
+        mockSetting(MediaPreviewValue.Off, {});
+        render(<HideActionButton mxEvent={event} />, withClientContextRenderOptions(cli));
         expect(screen.queryByRole("button")).toBeNull();
     });
     it("should store event as hidden when clicked", async () => {
         const spy = jest.spyOn(SettingsStore, "setValue");
-        render(<HideActionButton mxEvent={event} />);
+        render(<HideActionButton mxEvent={event} />, withClientContextRenderOptions(cli));
         fireEvent.click(screen.getByRole("button"));
         expect(spy).toHaveBeenCalledWith("showMediaEventIds", null, SettingLevel.DEVICE, { "$foo:bar": false });
         // Button should be hidden after the setting is set.
diff --git a/test/unit-tests/components/views/messages/MImageBody-test.tsx b/test/unit-tests/components/views/messages/MImageBody-test.tsx
index b46ae29f3b..edda0d3add 100644
--- a/test/unit-tests/components/views/messages/MImageBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MImageBody-test.tsx
@@ -1,12 +1,12 @@
 /*
-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
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { act } from "react";
+import React from "react";
 import { fireEvent, render, screen, waitFor, waitForElementToBeRemoved } from "jest-matrix-react";
 import { EventType, getHttpUriForMxc, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
 import fetchMock from "fetch-mock-jest";
@@ -24,10 +24,11 @@ import {
     mockClientMethodsDevice,
     mockClientMethodsServer,
     mockClientMethodsUser,
+    withClientContextRenderOptions,
 } from "../../../../test-utils";
 import { MediaEventHelper } from "../../../../../src/utils/MediaEventHelper";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
-import { SettingLevel } from "../../../../../src/settings/SettingLevel";
+import { MediaPreviewValue } from "../../../../../src/@types/media_preview";
 
 jest.mock("matrix-encrypt-attachment", () => ({
     decryptAttachment: jest.fn(),
@@ -42,6 +43,7 @@ describe("<MImageBody/>", () => {
         ...mockClientMethodsDevice(deviceId),
         ...mockClientMethodsCrypto(),
         getRooms: jest.fn().mockReturnValue([]),
+        getRoom: jest.fn(),
         getIgnoredUsers: jest.fn(),
         getVersions: jest.fn().mockResolvedValue({
             unstable_features: {
@@ -85,6 +87,7 @@ describe("<MImageBody/>", () => {
     });
 
     afterEach(() => {
+        SettingsStore.reset();
         mocked(encrypt.decryptAttachment).mockReset();
     });
 
@@ -97,6 +100,7 @@ describe("<MImageBody/>", () => {
                 mxEvent={encryptedMediaEvent}
                 mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
             />,
+            withClientContextRenderOptions(cli),
         );
 
         // thumbnail with dimensions present
@@ -112,6 +116,7 @@ describe("<MImageBody/>", () => {
                 mxEvent={encryptedMediaEvent}
                 mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
             />,
+            withClientContextRenderOptions(cli),
         );
 
         expect(fetchMock).toHaveBeenCalledWith(url);
@@ -129,6 +134,7 @@ describe("<MImageBody/>", () => {
                 mxEvent={encryptedMediaEvent}
                 mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
             />,
+            withClientContextRenderOptions(cli),
         );
 
         await screen.findByText("Error decrypting image");
@@ -136,25 +142,12 @@ describe("<MImageBody/>", () => {
 
     describe("with image previews/thumbnails disabled", () => {
         beforeEach(() => {
-            act(() => {
-                SettingsStore.setValue("showImages", null, SettingLevel.DEVICE, false);
-            });
-        });
-
-        afterEach(() => {
-            act(() => {
-                SettingsStore.setValue(
-                    "showImages",
-                    null,
-                    SettingLevel.DEVICE,
-                    SettingsStore.getDefaultValue("showImages"),
-                );
-                SettingsStore.setValue(
-                    "showMediaEventIds",
-                    null,
-                    SettingLevel.DEVICE,
-                    SettingsStore.getDefaultValue("showMediaEventIds"),
-                );
+            const origFn = SettingsStore.getValue;
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => {
+                if (setting === "mediaPreviewConfig") {
+                    return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off };
+                }
+                return origFn(setting, ...args);
             });
         });
 
@@ -167,6 +160,7 @@ describe("<MImageBody/>", () => {
                     mxEvent={encryptedMediaEvent}
                     mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
                 />,
+                withClientContextRenderOptions(cli),
             );
 
             expect(screen.getByText("Show image")).toBeInTheDocument();
@@ -183,6 +177,7 @@ describe("<MImageBody/>", () => {
                     mxEvent={encryptedMediaEvent}
                     mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
                 />,
+                withClientContextRenderOptions(cli),
             );
 
             expect(screen.getByText("Show image")).toBeInTheDocument();
@@ -220,6 +215,7 @@ describe("<MImageBody/>", () => {
 
         const { container } = render(
             <MImageBody {...props} mxEvent={event} mediaEventHelper={new MediaEventHelper(event)} />,
+            withClientContextRenderOptions(cli),
         );
 
         const img = container.querySelector(".mx_MImageBody_thumbnail")!;
@@ -273,6 +269,7 @@ describe("<MImageBody/>", () => {
 
         const { container } = render(
             <MImageBody {...props} mxEvent={event} mediaEventHelper={new MediaEventHelper(event)} />,
+            withClientContextRenderOptions(cli),
         );
 
         // Wait for spinners to go away
@@ -298,6 +295,7 @@ describe("<MImageBody/>", () => {
 
         const { container } = render(
             <MImageBody {...props} mxEvent={event} mediaEventHelper={new MediaEventHelper(event)} />,
+            withClientContextRenderOptions(cli),
         );
 
         const img = container.querySelector(".mx_MImageBody_thumbnail")!;
diff --git a/test/unit-tests/components/views/messages/MStickerBody-test.tsx b/test/unit-tests/components/views/messages/MStickerBody-test.tsx
index d78f797dea..3ae44215d1 100644
--- a/test/unit-tests/components/views/messages/MStickerBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MStickerBody-test.tsx
@@ -19,6 +19,7 @@ import {
     mockClientMethodsDevice,
     mockClientMethodsServer,
     mockClientMethodsUser,
+    withClientContextRenderOptions,
 } from "../../../../test-utils";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
 import MStickerBody from "../../../../../src/components/views/messages/MStickerBody";
@@ -31,6 +32,7 @@ describe("<MStickerBody/>", () => {
         ...mockClientMethodsServer(),
         ...mockClientMethodsDevice(deviceId),
         ...mockClientMethodsCrypto(),
+        getRoom: jest.fn(),
         getRooms: jest.fn().mockReturnValue([]),
         getIgnoredUsers: jest.fn(),
         getVersions: jest.fn().mockResolvedValue({
@@ -76,7 +78,7 @@ describe("<MStickerBody/>", () => {
     it("should show a tooltip on hover", async () => {
         fetchMock.getOnce(url, { status: 200 });
 
-        render(<MStickerBody {...props} mxEvent={mediaEvent} />);
+        render(<MStickerBody {...props} mxEvent={mediaEvent} />, withClientContextRenderOptions(cli));
 
         expect(screen.queryByRole("tooltip")).toBeNull();
         await userEvent.hover(screen.getByRole("img"));
diff --git a/test/unit-tests/components/views/messages/MVideoBody-test.tsx b/test/unit-tests/components/views/messages/MVideoBody-test.tsx
index dd916e8de0..1d058a7b0c 100644
--- a/test/unit-tests/components/views/messages/MVideoBody-test.tsx
+++ b/test/unit-tests/components/views/messages/MVideoBody-test.tsx
@@ -1,15 +1,16 @@
 /*
-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
 Please see LICENSE files in the repository root for full details.
 */
 
-import React, { act } from "react";
-import { EventType, getHttpUriForMxc, type IContent, MatrixEvent } from "matrix-js-sdk/src/matrix";
+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 fetchMock from "fetch-mock-jest";
+import { type MockedObject } from "jest-mock";
 
 import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
 import { type RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
@@ -20,11 +21,12 @@ import {
     mockClientMethodsDevice,
     mockClientMethodsServer,
     mockClientMethodsUser,
+    withClientContextRenderOptions,
 } from "../../../../test-utils";
 import MVideoBody from "../../../../../src/components/views/messages/MVideoBody";
 import type { IBodyProps } from "../../../../../src/components/views/messages/IBodyProps";
-import { SettingLevel } from "../../../../../src/settings/SettingLevel";
 import SettingsStore from "../../../../../src/settings/SettingsStore";
+import { MediaPreviewValue } from "../../../../../src/@types/media_preview";
 
 // Needed so we don't throw an error about failing to decrypt.
 jest.mock("matrix-encrypt-attachment", () => ({
@@ -36,13 +38,15 @@ describe("MVideoBody", () => {
     const deviceId = "DEADB33F";
 
     const thumbUrl = "https://server/_matrix/media/v3/download/server/encrypted-poster";
+    let cli: MockedObject<MatrixClient>;
 
     beforeEach(() => {
-        const cli = getMockClientWithEventEmitter({
+        cli = getMockClientWithEventEmitter({
             ...mockClientMethodsUser(userId),
             ...mockClientMethodsServer(),
             ...mockClientMethodsDevice(deviceId),
             ...mockClientMethodsCrypto(),
+            getRoom: jest.fn(),
             getRooms: jest.fn().mockReturnValue([]),
             getIgnoredUsers: jest.fn(),
             getVersions: jest.fn().mockResolvedValue({
@@ -65,6 +69,7 @@ describe("MVideoBody", () => {
         room_id: "!room:server",
         sender: userId,
         type: EventType.RoomMessage,
+        event_id: "$foo:bar",
         content: {
             body: "alt for a test video",
             info: {
@@ -93,32 +98,25 @@ describe("MVideoBody", () => {
         fetchMock.getOnce(thumbUrl, { status: 200 });
         const { asFragment } = render(
             <MVideoBody mxEvent={encryptedMediaEvent} mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)} />,
+            withClientContextRenderOptions(cli),
         );
         expect(asFragment()).toMatchSnapshot();
     });
 
     describe("with video previews/thumbnails disabled", () => {
         beforeEach(() => {
-            act(() => {
-                SettingsStore.setValue("showImages", null, SettingLevel.DEVICE, false);
+            const origFn = SettingsStore.getValue;
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => {
+                if (setting === "mediaPreviewConfig") {
+                    return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off };
+                }
+                return origFn(setting, ...args);
             });
         });
 
         afterEach(() => {
-            act(() => {
-                SettingsStore.setValue(
-                    "showImages",
-                    null,
-                    SettingLevel.DEVICE,
-                    SettingsStore.getDefaultValue("showImages"),
-                );
-                SettingsStore.setValue(
-                    "showMediaEventIds",
-                    null,
-                    SettingLevel.DEVICE,
-                    SettingsStore.getDefaultValue("showMediaEventIds"),
-                );
-            });
+            SettingsStore.reset();
+            jest.restoreAllMocks();
         });
 
         it("should not download video", async () => {
@@ -129,6 +127,7 @@ describe("MVideoBody", () => {
                     mxEvent={encryptedMediaEvent}
                     mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
                 />,
+                withClientContextRenderOptions(cli),
             );
 
             expect(screen.getByText("Show video")).toBeInTheDocument();
@@ -144,6 +143,7 @@ describe("MVideoBody", () => {
                     mxEvent={encryptedMediaEvent}
                     mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)}
                 />,
+                withClientContextRenderOptions(cli),
             );
 
             const placeholderButton = screen.getByRole("button", { name: "Show video" });
@@ -191,6 +191,7 @@ function makeMVideoBody(w: number, h: number): RenderResult {
 
     const mockClient = getMockClientWithEventEmitter({
         mxcUrlToHttp: jest.fn(),
+        getRoom: jest.fn(),
     });
 
     return render(
diff --git a/test/unit-tests/components/views/messages/TextualBody-test.tsx b/test/unit-tests/components/views/messages/TextualBody-test.tsx
index 5534ae6911..cb3d755f8b 100644
--- a/test/unit-tests/components/views/messages/TextualBody-test.tsx
+++ b/test/unit-tests/components/views/messages/TextualBody-test.tsx
@@ -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="" src="mxc://avatar.url/image.png" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px"></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_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>"`,
             );
         });
 
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 48dc54241f..6470175c3c 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
@@ -34,7 +34,7 @@ exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] =
     class="mx_MLocationBody"
   >
     <div
-      aria-labelledby=":ri:"
+      aria-labelledby="«ri»"
       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="«ru»"
       class="mx_MLocationBody_map"
     >
       <div
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 8a725eee61..ae1c638a90 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
@@ -510,9 +510,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="" src="mxc://avatar.url/image.png" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px"></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_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 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="" src="mxc://avatar.url/room.png" referrerpolicy="no-referrer" class="_image_1qbcf_41" data-type="round" width="16px" height="16px"></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_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 unknown message in the same room with the label »Message« 1`] = `
 <div
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 f47cfdd23d..89c4ff0ba2 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
@@ -91,7 +91,7 @@ exports[`<PollHistory /> renders a list of active polls when there are polls in
             tabindex="0"
           >
             <div
-              aria-labelledby=":rc:"
+              aria-labelledby="«ra»"
               class="mx_PollListItem_content"
             >
               <span>
@@ -116,7 +116,7 @@ exports[`<PollHistory /> renders a list of active polls when there are polls in
             tabindex="0"
           >
             <div
-              aria-labelledby=":rh:"
+              aria-labelledby="«rf»"
               class="mx_PollListItem_content"
             >
               <span>
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 7b65c6e506..3319ae3856 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
@@ -10,7 +10,7 @@ exports[`<PollListItem /> renders a poll 1`] = `
       tabindex="0"
     >
       <div
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="mx_PollListItem_content"
       >
         <span>
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 1d8ea3c55e..1ae7a6b9d7 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
@@ -10,7 +10,7 @@ exports[`<PollListItemEnded /> renders a poll with no responses 1`] = `
       tabindex="0"
     >
       <div
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="mx_PollListItemEnded_content"
       >
         <div
diff --git a/test/unit-tests/components/views/right_panel/RoomSummaryCard-test.tsx b/test/unit-tests/components/views/right_panel/RoomSummaryCard-test.tsx
deleted file mode 100644
index e0b055e181..0000000000
--- a/test/unit-tests/components/views/right_panel/RoomSummaryCard-test.tsx
+++ /dev/null
@@ -1,378 +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, fireEvent, screen, waitFor } from "jest-matrix-react";
-import { EventType, MatrixEvent, Room, type MatrixClient, JoinRule } from "matrix-js-sdk/src/matrix";
-import { KnownMembership } from "matrix-js-sdk/src/types";
-import { mocked, type MockedObject } from "jest-mock";
-import userEvent from "@testing-library/user-event";
-
-import DMRoomMap from "../../../../../src/utils/DMRoomMap";
-import RoomSummaryCard from "../../../../../src/components/views/right_panel/RoomSummaryCard";
-import { ShareDialog } from "../../../../../src/components/views/dialogs/ShareDialog";
-import ExportDialog from "../../../../../src/components/views/dialogs/ExportDialog";
-import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
-import defaultDispatcher from "../../../../../src/dispatcher/dispatcher";
-import * as settingsHooks from "../../../../../src/hooks/useSettings";
-import Modal from "../../../../../src/Modal";
-import RightPanelStore from "../../../../../src/stores/right-panel/RightPanelStore";
-import { RightPanelPhases } from "../../../../../src/stores/right-panel/RightPanelStorePhases";
-import { flushPromises, stubClient } from "../../../../test-utils";
-import { PollHistoryDialog } from "../../../../../src/components/views/dialogs/PollHistoryDialog";
-import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
-import { _t } from "../../../../../src/languageHandler";
-import { tagRoom } from "../../../../../src/utils/room/tagRoom";
-import { DefaultTagID } from "../../../../../src/stores/room-list/models";
-import { Action } from "../../../../../src/dispatcher/actions";
-import { TimelineRenderingType } from "../../../../../src/contexts/RoomContext";
-import { ScopedRoomContextProvider } from "../../../../../src/contexts/ScopedRoomContext.tsx";
-
-jest.mock("../../../../../src/utils/room/tagRoom");
-
-describe("<RoomSummaryCard />", () => {
-    const userId = "@alice:domain.org";
-
-    const roomId = "!room:domain.org";
-    let mockClient!: MockedObject<MatrixClient>;
-    let room!: Room;
-
-    const getComponent = (props = {}) => {
-        const defaultProps = {
-            room,
-            onClose: jest.fn(),
-            permalinkCreator: new RoomPermalinkCreator(room),
-        };
-
-        return render(<RoomSummaryCard {...defaultProps} {...props} />, {
-            wrapper: ({ children }) => (
-                <MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
-            ),
-        });
-    };
-
-    beforeEach(() => {
-        mockClient = mocked(stubClient());
-        room = new Room(roomId, mockClient, userId);
-        const roomCreateEvent = new MatrixEvent({
-            type: "m.room.create",
-            room_id: roomId,
-            sender: userId,
-            content: {
-                creator: userId,
-                room_version: "5",
-            },
-            state_key: "",
-        });
-        room.currentState.setStateEvents([roomCreateEvent]);
-        room.updateMyMembership(KnownMembership.Join);
-
-        jest.spyOn(Modal, "createDialog");
-        jest.spyOn(RightPanelStore.instance, "pushCard");
-        jest.spyOn(settingsHooks, "useFeatureEnabled").mockReturnValue(false);
-        jest.spyOn(defaultDispatcher, "dispatch");
-        jest.clearAllMocks();
-        DMRoomMap.makeShared(mockClient);
-
-        mockClient.getRoom.mockReturnValue(room);
-        jest.spyOn(room, "isElementVideoRoom").mockRestore();
-        jest.spyOn(room, "isCallRoom").mockRestore();
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it("renders the room summary", () => {
-        const { container } = getComponent();
-        expect(container).toMatchSnapshot();
-    });
-
-    it("renders the room topic in the summary", () => {
-        room.currentState.setStateEvents([
-            new MatrixEvent({
-                type: "m.room.topic",
-                room_id: roomId,
-                sender: userId,
-                content: {
-                    topic: "This is the room's topic.",
-                },
-                state_key: "",
-            }),
-        ]);
-        const { container } = getComponent();
-        expect(container).toMatchSnapshot();
-    });
-
-    it("has button to edit topic", () => {
-        room.currentState.setStateEvents([
-            new MatrixEvent({
-                type: "m.room.topic",
-                room_id: roomId,
-                sender: userId,
-                content: {
-                    topic: "This is the room's topic.",
-                },
-                state_key: "",
-            }),
-        ]);
-        const { container, getByText } = getComponent();
-        expect(getByText("Edit")).toBeInTheDocument();
-        expect(container).toMatchSnapshot();
-    });
-
-    describe("search", () => {
-        it("has the search field", async () => {
-            const onSearchChange = jest.fn();
-            const { getByPlaceholderText } = getComponent({
-                onSearchChange,
-            });
-            expect(getByPlaceholderText("Search messages…")).toBeVisible();
-        });
-
-        it("should focus the search field if Action.FocusMessageSearch is fired", async () => {
-            const onSearchChange = jest.fn();
-            const { getByPlaceholderText } = getComponent({
-                onSearchChange,
-            });
-            expect(getByPlaceholderText("Search messages…")).not.toHaveFocus();
-            defaultDispatcher.fire(Action.FocusMessageSearch);
-            await waitFor(() => {
-                expect(getByPlaceholderText("Search messages…")).toHaveFocus();
-            });
-        });
-
-        it("should focus the search field if focusRoomSearch=true", () => {
-            const onSearchChange = jest.fn();
-            const { getByPlaceholderText } = getComponent({
-                onSearchChange,
-                focusRoomSearch: true,
-            });
-            expect(getByPlaceholderText("Search messages…")).toHaveFocus();
-        });
-
-        it("should cancel search on escape", () => {
-            const onSearchChange = jest.fn();
-            const onSearchCancel = jest.fn();
-            const { getByPlaceholderText } = getComponent({
-                onSearchChange,
-                onSearchCancel,
-                focusRoomSearch: true,
-            });
-            expect(getByPlaceholderText("Search messages…")).toHaveFocus();
-            fireEvent.keyDown(getByPlaceholderText("Search messages…"), { key: "Escape" });
-            expect(onSearchCancel).toHaveBeenCalled();
-        });
-
-        it("should empty search field when the timeline rendering type changes away", async () => {
-            const onSearchChange = jest.fn();
-            const { rerender } = render(
-                <MatrixClientContext.Provider value={mockClient}>
-                    <ScopedRoomContextProvider {...({ timelineRenderingType: TimelineRenderingType.Search } as any)}>
-                        <RoomSummaryCard
-                            room={room}
-                            permalinkCreator={new RoomPermalinkCreator(room)}
-                            onSearchChange={onSearchChange}
-                            focusRoomSearch={true}
-                        />
-                    </ScopedRoomContextProvider>
-                </MatrixClientContext.Provider>,
-            );
-
-            await userEvent.type(screen.getByPlaceholderText("Search messages…"), "test");
-            expect(screen.getByPlaceholderText("Search messages…")).toHaveValue("test");
-
-            rerender(
-                <MatrixClientContext.Provider value={mockClient}>
-                    <ScopedRoomContextProvider {...({ timelineRenderingType: TimelineRenderingType.Room } as any)}>
-                        <RoomSummaryCard
-                            room={room}
-                            permalinkCreator={new RoomPermalinkCreator(room)}
-                            onSearchChange={onSearchChange}
-                        />
-                    </ScopedRoomContextProvider>
-                </MatrixClientContext.Provider>,
-            );
-            expect(screen.getByPlaceholderText("Search messages…")).toHaveValue("");
-        });
-    });
-
-    it("opens room file panel on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText("Files"));
-
-        expect(RightPanelStore.instance.pushCard).toHaveBeenCalledWith({ phase: RightPanelPhases.FilePanel }, true);
-    });
-
-    it("opens room export dialog on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText(_t("export_chat|title")));
-
-        expect(Modal.createDialog).toHaveBeenCalledWith(ExportDialog, { room });
-    });
-
-    it("opens share room dialog on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText(_t("action|copy_link")));
-
-        expect(Modal.createDialog).toHaveBeenCalledWith(ShareDialog, { target: room });
-    });
-
-    it("opens invite dialog on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText(_t("action|invite")));
-
-        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "view_invite", roomId: room.roomId });
-    });
-
-    it("fires favourite dispatch on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText(_t("room|context_menu|favourite")));
-
-        expect(tagRoom).toHaveBeenCalledWith(room, DefaultTagID.Favourite);
-    });
-
-    it("opens room settings on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText(_t("common|settings")));
-
-        expect(defaultDispatcher.dispatch).toHaveBeenCalledWith({ action: "open_room_settings" });
-    });
-
-    it("opens room member list on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText("People"));
-
-        expect(RightPanelStore.instance.pushCard).toHaveBeenCalledWith({ phase: RightPanelPhases.MemberList }, true);
-    });
-
-    it("opens room threads list on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText("Threads"));
-
-        expect(RightPanelStore.instance.pushCard).toHaveBeenCalledWith({ phase: RightPanelPhases.ThreadPanel }, true);
-    });
-
-    it("opens room pinned messages on button click", () => {
-        const { getByText } = getComponent();
-
-        fireEvent.click(getByText("Pinned messages"));
-
-        expect(RightPanelStore.instance.pushCard).toHaveBeenCalledWith(
-            { phase: RightPanelPhases.PinnedMessages },
-            true,
-        );
-    });
-
-    describe("pinning", () => {
-        it("renders pins options", () => {
-            const { getByText } = getComponent();
-
-            expect(getByText("Pinned messages")).toBeInTheDocument();
-        });
-    });
-
-    describe("poll history", () => {
-        it("renders poll history option", () => {
-            const { getByText } = getComponent();
-
-            expect(getByText("Polls")).toBeInTheDocument();
-        });
-
-        it("opens poll history dialog on button click", () => {
-            const permalinkCreator = new RoomPermalinkCreator(room);
-            const { getByText } = getComponent({ permalinkCreator });
-
-            fireEvent.click(getByText("Polls"));
-
-            expect(Modal.createDialog).toHaveBeenCalledWith(PollHistoryDialog, {
-                room,
-                matrixClient: mockClient,
-                permalinkCreator: permalinkCreator,
-            });
-        });
-    });
-
-    describe("video rooms", () => {
-        it("does not render irrelevant options for element video room", () => {
-            jest.spyOn(room, "isElementVideoRoom").mockReturnValue(true);
-            mocked(settingsHooks.useFeatureEnabled).mockImplementation((feature) => feature === "feature_video_rooms");
-            const { queryByText } = getComponent();
-
-            // options not rendered
-            expect(queryByText("Files")).not.toBeInTheDocument();
-            expect(queryByText("Pinned")).not.toBeInTheDocument();
-            expect(queryByText("Export chat")).not.toBeInTheDocument();
-        });
-
-        it("does not render irrelevant options for element call room", () => {
-            jest.spyOn(room, "isCallRoom").mockReturnValue(true);
-            mocked(settingsHooks.useFeatureEnabled).mockImplementation(
-                (feature) => feature === "feature_element_call_video_rooms" || feature === "feature_video_rooms",
-            );
-            const { queryByText } = getComponent();
-
-            // options not rendered
-            expect(queryByText("Files")).not.toBeInTheDocument();
-            expect(queryByText("Pinned")).not.toBeInTheDocument();
-            expect(queryByText("Export chat")).not.toBeInTheDocument();
-        });
-    });
-
-    describe("public room label", () => {
-        beforeEach(() => {
-            jest.spyOn(room.currentState, "getJoinRule").mockReturnValue(JoinRule.Public);
-        });
-
-        it("does not show public room label for a DM", async () => {
-            mockClient.getAccountData.mockImplementation((eventType) => {
-                if (eventType === EventType.Direct) {
-                    return new MatrixEvent({
-                        type: EventType.Direct,
-                        content: {
-                            "@bob:sesame.st": ["some-room-id"],
-                            // this room is a DM with ernie
-                            "@ernie:sesame.st": ["some-other-room-id", room.roomId],
-                        },
-                    });
-                }
-            });
-            getComponent();
-
-            await flushPromises();
-
-            expect(screen.queryByText("Public room")).not.toBeInTheDocument();
-        });
-
-        it("does not show public room label for non public room", async () => {
-            jest.spyOn(room.currentState, "getJoinRule").mockReturnValue(JoinRule.Invite);
-            getComponent();
-
-            await flushPromises();
-
-            expect(screen.queryByText("Public room")).not.toBeInTheDocument();
-        });
-
-        it("shows a public room label for a public room", async () => {
-            jest.spyOn(room.currentState, "getJoinRule").mockReturnValue(JoinRule.Public);
-            getComponent();
-
-            await flushPromises();
-
-            expect(screen.queryByText("Public room")).toBeInTheDocument();
-        });
-    });
-});
diff --git a/test/unit-tests/components/views/right_panel/RoomSummaryCardView-test.tsx b/test/unit-tests/components/views/right_panel/RoomSummaryCardView-test.tsx
new file mode 100644
index 0000000000..0e5c7efffe
--- /dev/null
+++ b/test/unit-tests/components/views/right_panel/RoomSummaryCardView-test.tsx
@@ -0,0 +1,324 @@
+/*
+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, fireEvent, screen } from "jest-matrix-react";
+import { Room, type MatrixClient, JoinRule, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { mocked, type MockedObject } from "jest-mock";
+import userEvent from "@testing-library/user-event";
+
+import RoomSummaryCardView from "../../../../../src/components/views/right_panel/RoomSummaryCardView";
+import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext";
+import { flushPromises, stubClient } from "../../../../test-utils";
+import { RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks";
+import { _t } from "../../../../../src/languageHandler";
+import {
+    type RoomSummaryCardState,
+    useRoomSummaryCardViewModel,
+} from "../../../../../src/components/viewmodels/right_panel/RoomSummaryCardViewModel";
+import DMRoomMap from "../../../../../src/utils/DMRoomMap";
+
+// Mock the viewmodel hooks
+jest.mock("../../../../../src/components/viewmodels/right_panel/RoomSummaryCardViewModel", () => ({
+    useRoomSummaryCardViewModel: jest.fn(),
+}));
+
+describe("<RoomSummaryCard />", () => {
+    const userId = "@alice:domain.org";
+
+    const roomId = "!room:domain.org";
+    let mockClient!: MockedObject<MatrixClient>;
+    let room!: Room;
+
+    const getComponent = (props = {}) => {
+        const defaultProps = {
+            room,
+            onClose: jest.fn(),
+            permalinkCreator: new RoomPermalinkCreator(room),
+        };
+
+        return render(<RoomSummaryCardView {...defaultProps} {...props} />, {
+            wrapper: ({ children }) => (
+                <MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
+            ),
+        });
+    };
+
+    // Setup mock view models
+    const vmDefaultValues: RoomSummaryCardState = {
+        isDirectMessage: false,
+        isRoomEncrypted: false,
+        e2eStatus: undefined,
+        isVideoRoom: false,
+        roomJoinRule: JoinRule.Public,
+        alias: "",
+        isFavorite: false,
+        canInviteToState: true,
+        pinCount: 0,
+        searchInputRef: { current: null },
+        onUpdateSearchInput: jest.fn(),
+        onRoomMembersClick: jest.fn(),
+        onRoomThreadsClick: jest.fn(),
+        onRoomFilesClick: jest.fn(),
+        onRoomExtensionsClick: jest.fn(),
+        onRoomPinsClick: jest.fn(),
+        onRoomSettingsClick: jest.fn(),
+        onLeaveRoomClick: jest.fn(),
+        onShareRoomClick: jest.fn(),
+        onRoomExportClick: jest.fn(),
+        onRoomPollHistoryClick: jest.fn(),
+        onReportRoomClick: jest.fn(),
+        onFavoriteToggleClick: jest.fn(),
+        onInviteToRoomClick: jest.fn(),
+    };
+
+    beforeEach(() => {
+        mockClient = mocked(stubClient());
+        room = new Room(roomId, mockClient, userId);
+        mocked(useRoomSummaryCardViewModel).mockReturnValue(vmDefaultValues);
+        DMRoomMap.makeShared(mockClient);
+
+        mockClient.getRoom.mockReturnValue(room);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("renders the room summary", () => {
+        const { container } = getComponent();
+        expect(container).toMatchSnapshot();
+    });
+
+    it("renders the room topic in the summary", () => {
+        room.currentState.setStateEvents([
+            new MatrixEvent({
+                type: "m.room.topic",
+                room_id: roomId,
+                sender: userId,
+                content: {
+                    topic: "This is the room's topic.",
+                },
+                state_key: "",
+            }),
+        ]);
+        const { container } = getComponent();
+        expect(container).toMatchSnapshot();
+    });
+
+    it("has button to edit topic", () => {
+        room.currentState.setStateEvents([
+            new MatrixEvent({
+                type: "m.room.topic",
+                room_id: roomId,
+                sender: userId,
+                content: {
+                    topic: "This is the room's topic.",
+                },
+                state_key: "",
+            }),
+        ]);
+        const { container, getByText } = getComponent();
+        expect(getByText("Edit")).toBeInTheDocument();
+        expect(container).toMatchSnapshot();
+    });
+
+    describe("search", () => {
+        it("has the search field", async () => {
+            const onSearchChange = jest.fn();
+            const { getByPlaceholderText } = getComponent({
+                onSearchChange,
+            });
+            expect(getByPlaceholderText("Search messages…")).toBeVisible();
+        });
+
+        it("should focus the search field if focusRoomSearch=true", () => {
+            const onSearchChange = jest.fn();
+            const { getByPlaceholderText } = getComponent({
+                onSearchChange,
+                focusRoomSearch: true,
+            });
+            expect(getByPlaceholderText("Search messages…")).toHaveFocus();
+        });
+
+        it("should cancel search on escape", () => {
+            const onSearchChange = jest.fn();
+            const onSearchCancel = jest.fn();
+
+            const { getByPlaceholderText } = getComponent({
+                onSearchChange,
+                onSearchCancel,
+                focusRoomSearch: true,
+            });
+            expect(getByPlaceholderText("Search messages…")).toHaveFocus();
+            fireEvent.keyDown(getByPlaceholderText("Search messages…"), { key: "Escape" });
+            expect(vmDefaultValues.onUpdateSearchInput).toHaveBeenCalled();
+        });
+
+        it("should update the search field value correctly", async () => {
+            const user = userEvent.setup();
+
+            const onSearchChange = jest.fn();
+            const { getByPlaceholderText } = getComponent({
+                onSearchChange,
+            });
+
+            const searchInput = getByPlaceholderText("Search messages…");
+            await user.type(searchInput, "test query");
+
+            expect(onSearchChange).toHaveBeenCalledWith("test query");
+            expect(searchInput).toHaveValue("test query");
+        });
+    });
+
+    it("opens room file panel on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText("Files"));
+
+        expect(vmDefaultValues.onRoomFilesClick).toHaveBeenCalled();
+    });
+
+    it("opens room export dialog on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText(_t("export_chat|title")));
+
+        expect(vmDefaultValues.onRoomExportClick).toHaveBeenCalled();
+    });
+
+    it("opens share room dialog on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText(_t("action|copy_link")));
+
+        expect(vmDefaultValues.onShareRoomClick).toHaveBeenCalled();
+    });
+
+    it("opens invite dialog on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText(_t("action|invite")));
+
+        expect(vmDefaultValues.onInviteToRoomClick).toHaveBeenCalled();
+    });
+
+    it("fires favourite dispatch on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText(_t("room|context_menu|favourite")));
+
+        expect(vmDefaultValues.onFavoriteToggleClick).toHaveBeenCalled();
+    });
+
+    it("opens room settings on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText(_t("common|settings")));
+
+        expect(vmDefaultValues.onRoomSettingsClick).toHaveBeenCalled();
+    });
+
+    it("opens room member list on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText("People"));
+
+        expect(vmDefaultValues.onRoomMembersClick).toHaveBeenCalled();
+    });
+
+    it("opens room threads list on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText("Threads"));
+
+        expect(vmDefaultValues.onRoomThreadsClick).toHaveBeenCalled();
+    });
+
+    it("opens room pinned messages on button click", () => {
+        const { getByText } = getComponent();
+
+        fireEvent.click(getByText("Pinned messages"));
+
+        expect(vmDefaultValues.onRoomPinsClick).toHaveBeenCalled();
+    });
+
+    it("does not render irrelevant options if video room", () => {
+        mocked(useRoomSummaryCardViewModel).mockReturnValue({
+            ...vmDefaultValues,
+            isVideoRoom: true,
+        });
+        const { queryByText } = getComponent();
+
+        // options not rendered
+        expect(queryByText("Files")).not.toBeInTheDocument();
+        expect(queryByText("Pinned")).not.toBeInTheDocument();
+        expect(queryByText("Export chat")).not.toBeInTheDocument();
+    });
+
+    describe("pinning", () => {
+        it("renders pins options", () => {
+            const { getByText } = getComponent();
+
+            expect(getByText("Pinned messages")).toBeInTheDocument();
+        });
+    });
+
+    describe("poll history", () => {
+        it("renders poll history option", () => {
+            const { getByText } = getComponent();
+
+            expect(getByText("Polls")).toBeInTheDocument();
+        });
+
+        it("opens poll history dialog on button click", () => {
+            const permalinkCreator = new RoomPermalinkCreator(room);
+            const { getByText } = getComponent({ permalinkCreator });
+
+            fireEvent.click(getByText("Polls"));
+
+            expect(vmDefaultValues.onRoomPollHistoryClick).toHaveBeenCalled();
+        });
+    });
+
+    describe("public room label", () => {
+        it("does not show public room label for a DM", async () => {
+            mocked(useRoomSummaryCardViewModel).mockReturnValue({
+                ...vmDefaultValues,
+                isDirectMessage: true,
+            });
+
+            getComponent();
+
+            await flushPromises();
+
+            expect(screen.queryByText("Public room")).not.toBeInTheDocument();
+        });
+
+        it("does not show public room label for non public room", async () => {
+            mocked(useRoomSummaryCardViewModel).mockReturnValue({
+                ...vmDefaultValues,
+                isDirectMessage: false,
+                roomJoinRule: JoinRule.Invite,
+            });
+            getComponent();
+
+            await flushPromises();
+
+            expect(screen.queryByText("Public room")).not.toBeInTheDocument();
+        });
+
+        it("shows a public room label for a public room", async () => {
+            getComponent();
+
+            await flushPromises();
+
+            expect(screen.queryByText("Public room")).toBeInTheDocument();
+        });
+    });
+});
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 a70fdabafd..1a58b1e2e0 100644
--- a/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
+++ b/test/unit-tests/components/views/right_panel/UserInfo-test.tsx
@@ -20,7 +20,6 @@ import {
     Device,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
-import { defer } from "matrix-js-sdk/src/utils";
 import { EventEmitter } from "events";
 import {
     UserVerificationStatus,
@@ -467,7 +466,7 @@ describe("<UserInfo />", () => {
 
             await expect(screen.findByRole("button", { name: "Deactivate user" })).resolves.toBeInTheDocument();
             if (screen.queryAllByRole("progressbar").length) {
-                await waitForElementToBeRemoved(() => screen.queryAllByRole("progressbar"));
+                await act(() => waitForElementToBeRemoved(() => screen.queryAllByRole("progressbar")));
             }
             expect(container).toMatchSnapshot();
         });
@@ -714,7 +713,7 @@ describe("<UserOptionsSection />", () => {
     ])(
         "clicking »message« %s should start a DM",
         async (test: string, member: RoomMember | User, expectedAvatarUrl: string | undefined) => {
-            const deferred = defer<string>();
+            const deferred = Promise.withResolvers<string>();
             mocked(startDmOnFirstMessage).mockReturnValue(deferred.promise);
 
             renderComponent({ member });
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 dc85fba985..ef91df63af 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
@@ -19,7 +19,7 @@ exports[`<BaseCard /> should close when clicking X button 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
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 0b975617d6..b3a84240f0 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
@@ -19,7 +19,7 @@ exports[`<ExtensionsCard /> should render empty state 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -119,7 +119,7 @@ exports[`<ExtensionsCard /> should render widgets 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r6:"
+        aria-labelledby="«r6»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
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 cbe8d7bf55..e0052d818c 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
@@ -19,7 +19,7 @@ exports[`<PinnedMessagesCard /> should show the empty state when there are no pi
         </p>
       </div>
       <button
-        aria-labelledby=":re:"
+        aria-labelledby="«re»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -100,7 +100,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":rk:"
+        aria-labelledby="«rk»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -157,7 +157,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby=":rq:"
+                aria-labelledby="«rq»"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
@@ -169,7 +169,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
                 aria-label="Open menu"
                 class="_icon-button_m2erp_8"
                 data-state="closed"
-                id="radix-:rv:"
+                id="radix-«rv»"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
@@ -235,7 +235,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby=":r11:"
+                aria-labelledby="«r11»"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
@@ -247,7 +247,7 @@ exports[`<PinnedMessagesCard /> should show two pinned messages 1`] = `
                 aria-label="Open menu"
                 class="_icon-button_m2erp_8"
                 data-state="closed"
-                id="radix-:r16:"
+                id="radix-«r16»"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
@@ -321,7 +321,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":rt2:"
+        aria-labelledby="«rt2»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -378,7 +378,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby=":rt8:"
+                aria-labelledby="«rt8»"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
@@ -390,7 +390,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
                 aria-label="Open menu"
                 class="_icon-button_m2erp_8"
                 data-state="closed"
-                id="radix-:rtd:"
+                id="radix-«rtd»"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
@@ -456,7 +456,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
               class="mx_PinnedEventTile_top"
             >
               <span
-                aria-labelledby=":rtf:"
+                aria-labelledby="«rtf»"
                 class="mx_PinnedEventTile_sender mx_Username_color3"
               >
                 @alice:example.org
@@ -468,7 +468,7 @@ exports[`<PinnedMessagesCard /> unpin all should not allow to unpinall 1`] = `
                 aria-label="Open menu"
                 class="_icon-button_m2erp_8"
                 data-state="closed"
-                id="radix-:rtk:"
+                id="radix-«rtk»"
                 role="button"
                 style="--cpd-icon-button-size: 24px;"
                 tabindex="0"
diff --git a/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap b/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
similarity index 84%
rename from test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
rename to test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
index 0d12e7deaa..10e9ae776d 100644
--- a/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCard-test.tsx.snap
+++ b/test/unit-tests/components/views/right_panel/__snapshots__/RoomSummaryCardView-test.tsx.snap
@@ -10,12 +10,13 @@ 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=":rm:"
+        aria-labelledby="«rq»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -46,6 +47,7 @@ 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"
@@ -71,6 +73,23 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           class="mx_Flex 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"
+          >
+            <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
+          </span>
           <span
             class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
             data-kind="grey"
@@ -151,6 +170,7 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
       </header>
       <div
         class="_separator_7ckbw_8"
+        data-floating-ui-inert=""
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -161,13 +181,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
       >
         <div
           aria-checked="false"
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -179,7 +200,7 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Favourite
           </span>
@@ -189,7 +210,7 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             <input
               aria-hidden="true"
               class="_input_19o42_24"
-              id=":rr:"
+              id="«rv»"
               type="checkbox"
             />
             <div
@@ -198,13 +219,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </div>
         </div>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -216,13 +238,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Invite
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -236,18 +258,20 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -265,13 +289,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             People
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -284,13 +308,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -305,13 +330,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Threads
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -324,17 +349,20 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <div
-          aria-expanded="false"
+          aria-controls="«r12»"
+          aria-describedby="«r12»"
+          aria-expanded="true"
           aria-haspopup="dialog"
+          data-floating-ui-inert=""
         >
           <button
-            class="_item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="primary"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -348,13 +376,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Pinned messages
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
@@ -372,14 +400,40 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             </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_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -391,13 +445,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Files
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -410,13 +464,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -428,13 +483,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Extensions
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -448,18 +503,20 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -471,13 +528,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Copy link
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -490,13 +547,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -508,13 +566,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Polls
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -527,13 +585,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -545,13 +604,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Export Chat
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -564,13 +623,14 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -585,13 +645,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Settings
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -605,21 +665,60 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
+          data-floating-ui-inert=""
         >
           <button
-            class="mx_RoomSummaryCard_leave _item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="critical"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              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 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>
+            <span
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+            >
+              Report room
+            </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="mx_RoomSummaryCard_leave _item_dyt4i_8 _interactive_dyt4i_26"
+            data-kind="critical"
+            role="menuitem"
+          >
+            <svg
+              aria-hidden="true"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -634,50 +733,13 @@ exports[`<RoomSummaryCard /> has button to edit topic 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Leave room
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
-              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_1x5l4_8 _interactive_1x5l4_26"
-            data-kind="critical"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_1x5l4_34"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              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>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
-            >
-              Report room
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
@@ -706,12 +768,13 @@ 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:"
+        aria-labelledby="«r0»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -742,6 +805,7 @@ 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"
@@ -767,6 +831,23 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           class="mx_Flex 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"
+          >
+            <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
+          </span>
           <span
             class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
             data-kind="grey"
@@ -810,6 +891,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
       </header>
       <div
         class="_separator_7ckbw_8"
+        data-floating-ui-inert=""
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -820,13 +902,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
       >
         <div
           aria-checked="false"
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -838,7 +921,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Favourite
           </span>
@@ -848,7 +931,7 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             <input
               aria-hidden="true"
               class="_input_19o42_24"
-              id=":r5:"
+              id="«r5»"
               type="checkbox"
             />
             <div
@@ -857,13 +940,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </div>
         </div>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -875,13 +959,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Invite
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -895,18 +979,20 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -924,13 +1010,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             People
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -943,13 +1029,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -964,13 +1051,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Threads
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -983,17 +1070,20 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <div
-          aria-expanded="false"
+          aria-controls="«r8»"
+          aria-describedby="«r8»"
+          aria-expanded="true"
           aria-haspopup="dialog"
+          data-floating-ui-inert=""
         >
           <button
-            class="_item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="primary"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -1007,13 +1097,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Pinned messages
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
@@ -1031,14 +1121,40 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             </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_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1050,13 +1166,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Files
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1069,13 +1185,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1087,13 +1204,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Extensions
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1107,18 +1224,20 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1130,13 +1249,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Copy link
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1149,13 +1268,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1167,13 +1287,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Polls
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1186,13 +1306,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1204,13 +1325,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Export Chat
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1223,13 +1344,14 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1244,13 +1366,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Settings
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1264,21 +1386,60 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
+          data-floating-ui-inert=""
         >
           <button
-            class="mx_RoomSummaryCard_leave _item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="critical"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              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 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>
+            <span
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+            >
+              Report room
+            </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="mx_RoomSummaryCard_leave _item_dyt4i_8 _interactive_dyt4i_26"
+            data-kind="critical"
+            role="menuitem"
+          >
+            <svg
+              aria-hidden="true"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -1293,50 +1454,13 @@ exports[`<RoomSummaryCard /> renders the room summary 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Leave room
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
-              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_1x5l4_8 _interactive_1x5l4_26"
-            data-kind="critical"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_1x5l4_34"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              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>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
-            >
-              Report room
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
@@ -1365,12 +1489,13 @@ 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=":rb:"
+        aria-labelledby="«rd»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -1401,6 +1526,7 @@ 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"
@@ -1426,6 +1552,23 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           class="mx_Flex 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"
+          >
+            <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
+          </span>
           <span
             class="_typography_6v6n8_153 _font-body-sm-medium_6v6n8_41 _badge_1t12g_8"
             data-kind="grey"
@@ -1506,6 +1649,7 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
       </header>
       <div
         class="_separator_7ckbw_8"
+        data-floating-ui-inert=""
         data-kind="primary"
         data-orientation="horizontal"
         role="separator"
@@ -1516,13 +1660,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
       >
         <div
           aria-checked="false"
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitemcheckbox"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1534,7 +1679,7 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Favourite
           </span>
@@ -1544,7 +1689,7 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             <input
               aria-hidden="true"
               class="_input_19o42_24"
-              id=":rg:"
+              id="«ri»"
               type="checkbox"
             />
             <div
@@ -1553,13 +1698,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </div>
         </div>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1571,13 +1717,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Invite
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1591,18 +1737,20 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1620,13 +1768,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             People
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1639,13 +1787,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1660,13 +1809,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Threads
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1679,17 +1828,20 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <div
-          aria-expanded="false"
+          aria-controls="«rl»"
+          aria-describedby="«rl»"
+          aria-expanded="true"
           aria-haspopup="dialog"
+          data-floating-ui-inert=""
         >
           <button
-            class="_item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="primary"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -1703,13 +1855,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Pinned messages
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
@@ -1727,14 +1879,40 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             </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_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1746,13 +1924,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Files
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1765,13 +1943,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1783,13 +1962,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Extensions
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1803,18 +1982,20 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1826,13 +2007,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Copy link
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1845,13 +2026,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1863,13 +2045,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Polls
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1882,13 +2064,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1900,13 +2083,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Export Chat
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1919,13 +2102,14 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
+          data-floating-ui-inert=""
           data-kind="primary"
           role="menuitem"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -1940,13 +2124,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Settings
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -1960,21 +2144,60 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
         </button>
         <div
           class="_separator_7ckbw_8"
+          data-floating-ui-inert=""
           data-kind="primary"
           data-orientation="horizontal"
           role="separator"
         />
         <div
           class="mx_RoomSummaryCard_bottomOptions"
+          data-floating-ui-inert=""
         >
           <button
-            class="mx_RoomSummaryCard_leave _item_1x5l4_8 _interactive_1x5l4_26"
+            class="_item_dyt4i_8 _interactive_dyt4i_26"
             data-kind="critical"
             role="menuitem"
           >
             <svg
               aria-hidden="true"
-              class="_icon_1x5l4_34"
+              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 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>
+            <span
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
+            >
+              Report room
+            </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="mx_RoomSummaryCard_leave _item_dyt4i_8 _interactive_dyt4i_26"
+            data-kind="critical"
+            role="menuitem"
+          >
+            <svg
+              aria-hidden="true"
+              class="_icon_dyt4i_50"
               fill="currentColor"
               height="24"
               viewBox="0 0 24 24"
@@ -1989,50 +2212,13 @@ exports[`<RoomSummaryCard /> renders the room topic in the summary 1`] = `
               />
             </svg>
             <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
             >
               Leave room
             </span>
             <svg
               aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
-              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_1x5l4_8 _interactive_1x5l4_26"
-            data-kind="critical"
-            role="menuitem"
-          >
-            <svg
-              aria-hidden="true"
-              class="_icon_1x5l4_34"
-              fill="currentColor"
-              height="24"
-              viewBox="0 0 24 24"
-              width="24"
-              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>
-            <span
-              class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
-            >
-              Report room
-            </span>
-            <svg
-              aria-hidden="true"
-              class="_nav-hint_1x5l4_50"
+              class="_nav-hint_dyt4i_59"
               fill="currentColor"
               height="24"
               viewBox="8 0 8 24"
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 bdb4800f90..654db50e0f 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
@@ -19,7 +19,7 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r6m:"
+        aria-labelledby="«r6i»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -128,13 +128,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
         class="mx_UserInfo_container"
       >
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -146,13 +146,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Send message
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -165,14 +165,14 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26 _disabled_1x5l4_109"
+          class="_item_dyt4i_8 _interactive_dyt4i_26 _disabled_dyt4i_118"
           data-kind="primary"
           disabled=""
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -184,13 +184,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            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_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -203,13 +203,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -221,13 +221,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Share profile
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -244,13 +244,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
         class="mx_UserInfo_container"
       >
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="critical"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -262,13 +262,13 @@ exports[`<UserInfo /> with crypto enabled renders <BasicUserInfo /> 1`] = `
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Ignore
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -305,7 +305,7 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
         </p>
       </div>
       <button
-        aria-labelledby=":r70:"
+        aria-labelledby="«r6s»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -401,34 +401,26 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
           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;"
         >
-          <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"
+          <p
+            class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31 mx_UserInfo_verification_unavailable"
           >
-            <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>
+            (
+            User verification unavailable
+            )
+          </p>
         </div>
       </div>
       <div
         class="mx_UserInfo_container"
       >
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -440,13 +432,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Send message
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -459,14 +451,14 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26 _disabled_1x5l4_109"
+          class="_item_dyt4i_8 _interactive_dyt4i_26 _disabled_dyt4i_118"
           data-kind="primary"
           disabled=""
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -478,13 +470,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            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_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -497,13 +489,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
           </svg>
         </button>
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="primary"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -515,13 +507,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Share profile
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -538,13 +530,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
         class="mx_UserInfo_container"
       >
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="critical"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -556,13 +548,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Deactivate user
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
@@ -579,13 +571,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
         class="mx_UserInfo_container"
       >
         <button
-          class="_item_1x5l4_8 _interactive_1x5l4_26"
+          class="_item_dyt4i_8 _interactive_dyt4i_26"
           data-kind="critical"
           role="button"
         >
           <svg
             aria-hidden="true"
-            class="_icon_1x5l4_34"
+            class="_icon_dyt4i_50"
             fill="currentColor"
             height="24"
             viewBox="0 0 24 24"
@@ -597,13 +589,13 @@ exports[`<UserInfo /> with crypto enabled should render a deactivate button for
             />
           </svg>
           <span
-            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+            class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
           >
             Ignore
           </span>
           <svg
             aria-hidden="true"
-            class="_nav-hint_1x5l4_50"
+            class="_nav-hint_dyt4i_59"
             fill="currentColor"
             height="24"
             viewBox="8 0 8 24"
diff --git a/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx b/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
index dd3ae7bc31..c54e16215e 100644
--- a/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
+++ b/test/unit-tests/components/views/rooms/NotificationDecoration-test.tsx
@@ -8,55 +8,94 @@
 import React from "react";
 import { render, screen } from "jest-matrix-react";
 
-import { type RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
+import { RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
 import { NotificationDecoration } from "../../../../../src/components/views/rooms/NotificationDecoration";
+import { createTestClient, mkStubRoom } from "../../../../test-utils";
 
 describe("<NotificationDecoration />", () => {
-    it("should not render if RoomNotificationState.isSilent=true", () => {
-        const state = { hasAnyNotificationOrActivity: false } as RoomNotificationState;
-        render(<NotificationDecoration notificationState={state} />);
+    let roomNotificationState: RoomNotificationState;
+    beforeEach(() => {
+        const matrixClient = createTestClient();
+        const room = mkStubRoom("roomId", "roomName", matrixClient);
+        roomNotificationState = new RoomNotificationState(room, false);
+    });
+
+    it("should not render if RoomNotificationState.hasAnyNotificationOrActivity=true", () => {
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(false);
+        render(<NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />);
         expect(screen.queryByTestId("notification-decoration")).toBeNull();
     });
 
     it("should render the unset message decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, isUnsetMessage: true } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "isUnsentMessage", "get").mockReturnValue(true);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the invitation decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, invited: true } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "invited", "get").mockReturnValue(true);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the mention decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, isMention: true, count: 1 } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "isMention", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(1);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the notification decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, isNotification: true, count: 1 } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "isNotification", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(1);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the notification decoration without count", () => {
-        const state = { hasAnyNotificationOrActivity: true, isNotification: true, count: 0 } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "isNotification", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "count", "get").mockReturnValue(0);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the activity decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, isActivityNotification: true } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "isActivityNotification", "get").mockReturnValue(true);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 
     it("should render the muted decoration", () => {
-        const state = { hasAnyNotificationOrActivity: true, muted: true } as RoomNotificationState;
-        const { asFragment } = render(<NotificationDecoration notificationState={state} />);
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(roomNotificationState, "muted", "get").mockReturnValue(true);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={false} />,
+        );
+        expect(asFragment()).toMatchSnapshot();
+    });
+    it("should render the video decoration", () => {
+        jest.spyOn(roomNotificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(false);
+        const { asFragment } = render(
+            <NotificationDecoration notificationState={roomNotificationState} hasVideoCall={true} />,
+        );
         expect(asFragment()).toMatchSnapshot();
     });
 });
diff --git a/test/unit-tests/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx b/test/unit-tests/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx
index 8365b458e4..4ba3cfc410 100644
--- a/test/unit-tests/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx
@@ -46,9 +46,11 @@ describe("<CallGuestLinkButton />", () => {
      */
     const makeRoom = (isVideoRoom = true): Room => {
         const room = new Room(roomId, sdkContext.client!, sdkContext.client!.getSafeUserId());
+        sdkContext.client!.getRoomDirectoryVisibility = jest.fn().mockResolvedValue("public");
         jest.spyOn(room, "isElementVideoRoom").mockReturnValue(isVideoRoom);
         // stub
         jest.spyOn(room, "getPendingEvents").mockReturnValue([]);
+        jest.spyOn(room, "getVersion").mockReturnValue("9");
         return room;
     };
     function mockRoomMembers(room: Room, count: number) {
@@ -221,24 +223,25 @@ describe("<CallGuestLinkButton />", () => {
         });
 
         it("shows ask to join if feature is enabled", () => {
-            const { container } = getComponent(room);
-            expect(getByText(container, "Ask to join")).toBeInTheDocument();
+            getComponent(room);
+            expect(screen.getByRole("radio", { name: "Ask to join ( Recommended )" })).toBeInTheDocument();
         });
-        it("font show ask to join if feature is enabled but cannot invite", () => {
+        it("dont show ask to join if feature is enabled but cannot invite", () => {
             getComponent(room, false);
-            expect(screen.queryByText("Ask to join")).not.toBeInTheDocument();
+            expect(screen.queryByRole("radio", { name: "Ask to join ( Recommended )" })).not.toBeInTheDocument();
         });
         it("doesn't show ask to join if feature is disabled", () => {
             jest.spyOn(SettingsStore, "getValue").mockReturnValue(false);
             getComponent(room);
-            expect(screen.queryByText("Ask to join")).not.toBeInTheDocument();
+            expect(screen.queryByRole("radio", { name: "Ask to join ( Recommended )" })).not.toBeInTheDocument();
         });
 
         it("sends correct state event on click", async () => {
             const sendStateSpy = jest.spyOn(sdkContext.client!, "sendStateEvent");
+
             let container;
             container = getComponent(room).container;
-            fireEvent.click(getByText(container, "Ask to join"));
+            fireEvent.click(screen.getByRole("radio", { name: "Ask to join ( Recommended )" }));
             expect(sendStateSpy).toHaveBeenCalledWith(
                 "!room:server.org",
                 "m.room.join_rules",
@@ -246,7 +249,7 @@ describe("<CallGuestLinkButton />", () => {
                 "",
             );
             expect(sendStateSpy).toHaveBeenCalledTimes(1);
-            await waitFor(() => expect(onFinished).toHaveBeenCalledTimes(1));
+            await waitFor(() => expect(onFinished).toHaveBeenCalledTimes(1), { timeout: 3000 });
             onFinished.mockClear();
             sendStateSpy.mockClear();
 
@@ -260,7 +263,7 @@ describe("<CallGuestLinkButton />", () => {
             );
             expect(sendStateSpy).toHaveBeenCalledTimes(1);
             container = getComponent(room).container;
-            await waitFor(() => expect(onFinished).toHaveBeenCalledTimes(1));
+            await waitFor(() => expect(onFinished).toHaveBeenCalledTimes(1), { timeout: 3000 });
             onFinished.mockClear();
             sendStateSpy.mockClear();
 
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 846adc8ab4..b93a26c412 100644
--- a/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomHeader/RoomHeader-test.tsx
@@ -1,5 +1,5 @@
 /*
-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
@@ -57,6 +57,7 @@ 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";
 
 jest.mock("../../../../../../src/utils/ShieldUtils");
 jest.mock("../../../../../../src/hooks/right-panel/useCurrentPhase", () => ({
@@ -99,6 +100,7 @@ describe("RoomHeader", () => {
 
     afterEach(() => {
         jest.restoreAllMocks();
+        SettingsStore.reset();
     });
 
     it("renders the room header", () => {
@@ -187,9 +189,7 @@ describe("RoomHeader", () => {
 
     it("opens the notifications panel", async () => {
         const user = userEvent.setup();
-        jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string): any => {
-            if (name === "feature_notifications") return true;
-        });
+        SettingsStore.setValue("feature_notifications", null, SettingLevel.DEVICE, true);
 
         render(<RoomHeader room={room} />, getWrapper());
 
@@ -226,9 +226,48 @@ describe("RoomHeader", () => {
         expect(screen.queryByRole("button", { name: "Voice call" })).not.toBeInTheDocument();
     });
 
+    describe("UIFeature.Voip disabled", () => {
+        beforeEach(() => {
+            SdkConfig.put({
+                setting_defaults: {
+                    [UIFeature.Voip]: false,
+                },
+            });
+        });
+
+        afterEach(() => {
+            SdkConfig.reset();
+            jest.restoreAllMocks();
+        });
+
+        it("should not show call buttons in rooms smaller than 3 members", async () => {
+            mockRoomMembers(room, 2);
+            render(<RoomHeader room={room} />, getWrapper());
+
+            expect(screen.queryByRole("button", { name: "Video call" })).not.toBeInTheDocument();
+            expect(screen.queryByRole("button", { name: "Voice call" })).not.toBeInTheDocument();
+        });
+
+        it("should not show call button in rooms larger than 2 members", async () => {
+            mockRoomMembers(room, 3);
+            render(<RoomHeader room={room} />, getWrapper());
+
+            expect(screen.queryByRole("button", { name: "Video call" })).not.toBeInTheDocument();
+            expect(screen.queryByRole("button", { name: "Voice call" })).not.toBeInTheDocument();
+        });
+    });
+
     describe("UIFeature.Widgets enabled (default)", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => feature == UIFeature.Widgets);
+            SdkConfig.put({
+                setting_defaults: {
+                    [UIFeature.Widgets]: true,
+                },
+            });
+        });
+
+        afterEach(() => {
+            SdkConfig.reset();
         });
 
         it("should show call buttons in a room with 2 members", () => {
@@ -248,7 +287,15 @@ describe("RoomHeader", () => {
 
     describe("UIFeature.Widgets disabled", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => false);
+            SdkConfig.put({
+                setting_defaults: {
+                    [UIFeature.Widgets]: false,
+                },
+            });
+        });
+
+        afterEach(() => {
+            SdkConfig.reset();
         });
 
         it("should show call buttons in a room with 2 members", () => {
@@ -268,7 +315,15 @@ describe("RoomHeader", () => {
 
     describe("groups call disabled", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => feature == UIFeature.Widgets);
+            SdkConfig.put({
+                setting_defaults: {
+                    [UIFeature.Widgets]: true,
+                },
+            });
+        });
+
+        afterEach(() => {
+            SdkConfig.reset();
         });
 
         it("you can't call if you're alone", () => {
@@ -333,15 +388,26 @@ describe("RoomHeader", () => {
 
     describe("group call enabled", () => {
         beforeEach(() => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation(
-                (feature) => feature === "feature_group_calls" || feature == UIFeature.Widgets,
-            );
+            SdkConfig.put({
+                features: {
+                    feature_group_calls: true,
+                },
+            });
+        });
+
+        afterEach(() => {
+            SdkConfig.reset();
+            jest.restoreAllMocks();
         });
 
         it("renders only the video call element", async () => {
             const user = userEvent.setup();
             mockRoomMembers(room, 3);
-            jest.spyOn(SdkConfig, "get").mockReturnValue({ use_exclusively: true });
+            SdkConfig.add({
+                element_call: {
+                    use_exclusively: true,
+                },
+            });
             // allow element calls
             jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true);
 
@@ -359,7 +425,11 @@ describe("RoomHeader", () => {
         });
 
         it("can't call if there's an ongoing (pinned) call", () => {
-            jest.spyOn(SdkConfig, "get").mockReturnValue({ use_exclusively: true });
+            SdkConfig.add({
+                element_call: {
+                    use_exclusively: true,
+                },
+            });
             // allow element calls
             jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true);
             jest.spyOn(WidgetLayoutStore.instance, "isInContainer").mockReturnValue(true);
@@ -377,7 +447,14 @@ describe("RoomHeader", () => {
         it("clicking on ongoing (unpinned) call re-pins it", async () => {
             const user = userEvent.setup();
             mockRoomMembers(room, 3);
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => feature == UIFeature.Widgets);
+            SdkConfig.add({
+                setting_defaults: {
+                    [UIFeature.Widgets]: true,
+                },
+                features: {
+                    feature_group_calls: false,
+                },
+            });
             // allow calls
             jest.spyOn(room.currentState, "mayClientSendStateEvent").mockReturnValue(true);
             jest.spyOn(WidgetLayoutStore.instance, "isInContainer").mockReturnValue(false);
@@ -427,8 +504,10 @@ describe("RoomHeader", () => {
             jest.spyOn(room.currentState, "maySendStateEvent").mockReturnValue(true);
             jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
             jest.spyOn(room, "canInvite").mockReturnValue(false);
-            const guestSpaUrlMock = jest.spyOn(SdkConfig, "get").mockImplementation((key) => {
-                return { guest_spa_url: "https://guest_spa_url.com", url: "https://spa_url.com" };
+            SdkConfig.add({
+                element_call: {
+                    guest_spa_url: "https://guest_spa_url.com",
+                },
             });
             const { container: containerNoInviteNotPublicCanUpgradeAccess } = render(
                 <RoomHeader room={room} />,
@@ -442,8 +521,10 @@ describe("RoomHeader", () => {
             jest.spyOn(room.currentState, "maySendStateEvent").mockReturnValue(false);
             jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Invite);
             jest.spyOn(room, "canInvite").mockReturnValue(false);
-            jest.spyOn(SdkConfig, "get").mockImplementation((key) => {
-                return { guest_spa_url: "https://guest_spa_url.com", url: "https://spa_url.com" };
+            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);
@@ -463,8 +544,9 @@ describe("RoomHeader", () => {
             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
-            guestSpaUrlMock.mockRestore();
             const { container: containerAllAllowedButNoGuestSpaUrl } = render(<RoomHeader room={room} />, getWrapper());
             expect(
                 queryAllByLabelText(containerAllAllowedButNoGuestSpaUrl, "There's no one here to call"),
@@ -643,6 +725,10 @@ describe("RoomHeader", () => {
             ]);
         });
 
+        afterEach(() => {
+            SdkConfig.reset();
+        });
+
         it.each([
             [ShieldUtils.E2EStatus.Verified, "Verified"],
             [ShieldUtils.E2EStatus.Warning, "Untrusted"],
@@ -655,6 +741,11 @@ describe("RoomHeader", () => {
         });
 
         it("does not show the face pile for DMs", () => {
+            SdkConfig.put({
+                features: {
+                    feature_notifications: false,
+                },
+            });
             const { asFragment } = render(<RoomHeader room={room} />, getWrapper());
 
             expect(asFragment()).toMatchSnapshot();
@@ -751,7 +842,7 @@ describe("RoomHeader", () => {
 
     describe("ask to join enabled", () => {
         it("does render the RoomKnocksBar", () => {
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((feature) => feature === "feature_ask_to_join");
+            SettingsStore.setValue("feature_ask_to_join", null, SettingLevel.DEVICE, true);
             jest.spyOn(room, "canInvite").mockReturnValue(true);
             jest.spyOn(room, "getJoinRule").mockReturnValue(JoinRule.Knock);
             jest.spyOn(room, "getMembersWithMembership").mockReturnValue([new RoomMember(room.roomId, "@foo")]);
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 cbeb618b00..a32d00d282 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
@@ -55,7 +55,7 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
         style="--cpd-icon-button-size: 100%; --cpd-color-icon-tertiary: var(--cpd-color-icon-disabled);"
       >
         <svg
-          aria-labelledby=":r166:"
+          aria-labelledby="«r1do»"
           fill="currentColor"
           height="1em"
           viewBox="0 0 24 24"
@@ -71,7 +71,7 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
     <button
       aria-disabled="true"
       aria-label="There's no one here to call"
-      aria-labelledby=":r16b:"
+      aria-labelledby="«r1dt»"
       class="_icon-button_m2erp_8"
       role="button"
       style="--cpd-icon-button-size: 32px;"
@@ -96,7 +96,7 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
     </button>
     <button
       aria-label="Threads"
-      aria-labelledby=":r16g:"
+      aria-labelledby="«r1e2»"
       class="_icon-button_m2erp_8"
       role="button"
       style="--cpd-icon-button-size: 32px;"
@@ -122,7 +122,7 @@ exports[`RoomHeader dm does not show the face pile for DMs 1`] = `
     </button>
     <button
       aria-label="Room info"
-      aria-labelledby=":r16l:"
+      aria-labelledby="«r1e7»"
       class="_icon-button_m2erp_8"
       role="button"
       style="--cpd-icon-button-size: 32px;"
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 ab662097b9..ec92f780ea 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
@@ -3,7 +3,7 @@
 exports[`<VideoRoomChatButton /> renders button with an unread marker when room is unread 1`] = `
 <button
   aria-label="Chat"
-  aria-labelledby=":r6:"
+  aria-labelledby="«r6»"
   class="_icon-button_m2erp_8"
   data-indicator="default"
   role="button"
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 b68929f74a..a8f87a4241 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/EmptyRoomList-test.tsx
@@ -10,8 +10,6 @@ import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
 import { type RoomListViewState } from "../../../../../../src/components/viewmodels/roomlist/RoomListViewModel";
-import { SecondaryFilters } from "../../../../../../src/components/viewmodels/roomlist/useFilteredRooms";
-import { SortOption } from "../../../../../../src/components/viewmodels/roomlist/useSorter";
 import { EmptyRoomList } from "../../../../../../src/components/views/rooms/RoomListPanel/EmptyRoomList";
 import { FilterKey } from "../../../../../../src/stores/room-list-v3/skip-list/filters";
 
@@ -20,17 +18,12 @@ describe("<EmptyRoomList />", () => {
 
     beforeEach(() => {
         vm = {
+            isLoadingRooms: false,
             rooms: [],
             primaryFilters: [],
-            activateSecondaryFilter: jest.fn().mockReturnValue({}),
-            activeSecondaryFilter: SecondaryFilters.AllActivity,
-            sort: jest.fn(),
-            activeSortOption: SortOption.Activity,
             createRoom: jest.fn(),
             createChatRoom: jest.fn(),
             canCreateRoom: true,
-            shouldShowMessagePreview: false,
-            toggleMessagePreview: jest.fn(),
             activeIndex: undefined,
         };
     });
@@ -57,13 +50,17 @@ describe("<EmptyRoomList />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
-    it("should display the empty state for the unread filter", async () => {
+    it.each([
+        { 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" },
+    ])("should display the empty state for the $name filter", async ({ key, name, action }) => {
         const user = userEvent.setup();
         const activePrimaryFilter = {
             toggle: jest.fn(),
             active: true,
-            name: "unread",
-            key: FilterKey.UnreadFilter,
+            name,
+            key,
         };
         const newState = {
             ...vm,
@@ -71,7 +68,7 @@ describe("<EmptyRoomList />", () => {
         };
 
         const { asFragment } = render(<EmptyRoomList vm={newState} />);
-        await user.click(screen.getByRole("button", { name: "Show all chats" }));
+        await user.click(screen.getByRole("button", { name: action }));
         expect(activePrimaryFilter.toggle).toHaveBeenCalled();
         expect(asFragment()).toMatchSnapshot();
     });
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 0d837c3a20..d5229ff667 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomList-test.tsx
@@ -8,13 +8,13 @@
 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 { 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 { SecondaryFilters } from "../../../../../../src/components/viewmodels/roomlist/useFilteredRooms";
-import { SortOption } from "../../../../../../src/components/viewmodels/roomlist/useSorter";
+import { Landmark, LandmarkNavigation } from "../../../../../../src/accessibility/LandmarkNavigation";
 
 describe("<RoomList />", () => {
     let matrixClient: MatrixClient;
@@ -29,14 +29,9 @@ describe("<RoomList />", () => {
         matrixClient = stubClient();
         const rooms = Array.from({ length: 10 }, (_, i) => mkRoom(matrixClient, `room${i}`));
         vm = {
+            isLoadingRooms: false,
             rooms,
             primaryFilters: [],
-            activateSecondaryFilter: () => {},
-            activeSecondaryFilter: SecondaryFilters.AllActivity,
-            sort: jest.fn(),
-            activeSortOption: SortOption.Activity,
-            shouldShowMessagePreview: false,
-            toggleMessagePreview: jest.fn(),
             createRoom: jest.fn(),
             createChatRoom: jest.fn(),
             canCreateRoom: true,
@@ -52,4 +47,16 @@ describe("<RoomList />", () => {
         const { asFragment } = render(<RoomList vm={vm} />);
         expect(asFragment()).toMatchSnapshot();
     });
+
+    it.each([
+        { shortcut: { key: "F6", ctrlKey: true, shiftKey: true }, isPreviousLandmark: true, label: "PreviousLandmark" },
+        { 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 roomList = getByTestId("room-list");
+        fireEvent.keyDown(roomList, shortcut);
+
+        expect(spyFindLandmark).toHaveBeenCalledWith(Landmark.ROOM_LIST, isPreviousLandmark);
+    });
 });
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 a2422283c8..41ef9b0cf1 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListHeaderView-test.tsx
@@ -15,6 +15,7 @@ import {
     useRoomListHeaderViewModel,
 } from "../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
 import { RoomListHeaderView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListHeaderView";
+import { SortOption } from "../../../../../../src/components/viewmodels/roomlist/useSorter";
 
 jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel", () => ({
     useRoomListHeaderViewModel: jest.fn(),
@@ -29,6 +30,8 @@ describe("<RoomListHeaderView />", () => {
         canCreateVideoRoom: true,
         canInviteInSpace: true,
         canAccessSpaceSettings: true,
+        sort: jest.fn(),
+        activeSortOption: SortOption.Activity,
         createRoom: jest.fn(),
         createVideoRoom: jest.fn(),
         createChatRoom: jest.fn(),
@@ -42,6 +45,13 @@ describe("<RoomListHeaderView />", () => {
         jest.resetAllMocks();
     });
 
+    it("should render 'room options' button", async () => {
+        mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
+        const { asFragment } = render(<RoomListHeaderView />);
+        expect(screen.getByRole("button", { name: "Room Options" })).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
     describe("compose menu", () => {
         it("should display the compose menu", () => {
             mocked(useRoomListHeaderViewModel).mockReturnValue(defaultValue);
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 de1d37ed08..4da783d10c 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemMenuView-test.tsx
@@ -17,6 +17,7 @@ import {
 import type { MatrixClient, Room } from "matrix-js-sdk/src/matrix";
 import { mkRoom, stubClient } from "../../../../../test-utils";
 import { RoomListItemMenuView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListItemMenuView";
+import { RoomNotifState } from "../../../../../../src/RoomNotifs";
 
 jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListItemMenuViewModel", () => ({
     useRoomListItemMenuViewModel: jest.fn(),
@@ -25,11 +26,17 @@ jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListItemMenu
 describe("<RoomListItemMenuView />", () => {
     const defaultValue: RoomListItemMenuViewState = {
         showMoreOptionsMenu: true,
+        showNotificationMenu: true,
         isFavourite: true,
+        isLowPriority: true,
         canInvite: true,
         canMarkAsUnread: true,
         canMarkAsRead: true,
         canCopyRoomLink: true,
+        isNotificationAllMessage: true,
+        isNotificationMentionOnly: true,
+        isNotificationAllMessageLoud: true,
+        isNotificationMute: true,
         copyRoomLink: jest.fn(),
         markAsUnread: jest.fn(),
         markAsRead: jest.fn(),
@@ -37,6 +44,7 @@ describe("<RoomListItemMenuView />", () => {
         toggleLowPriority: jest.fn(),
         toggleFavorite: jest.fn(),
         invite: jest.fn(),
+        setRoomNotifState: jest.fn(),
     };
 
     let matrixClient: MatrixClient;
@@ -58,22 +66,37 @@ describe("<RoomListItemMenuView />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
+    it("should render the notification options menu", () => {
+        const { asFragment } = renderMenu();
+        expect(screen.getByRole("button", { name: "Notification options" })).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
     it("should not render the more options menu when showMoreOptionsMenu is false", () => {
         mocked(useRoomListItemMenuViewModel).mockReturnValue({ ...defaultValue, showMoreOptionsMenu: false });
         renderMenu();
         expect(screen.queryByRole("button", { name: "More Options" })).toBeNull();
     });
 
-    it("should call setMenuOpen when the menu is opened", async () => {
-        const user = userEvent.setup();
-        const setMenuOpen = jest.fn();
-        renderMenu(setMenuOpen);
-
-        await user.click(screen.getByRole("button", { name: "More Options" }));
-        expect(setMenuOpen).toHaveBeenCalledWith(true);
+    it("should not render the notification options menu when showNotificationMenu is false", () => {
+        mocked(useRoomListItemMenuViewModel).mockReturnValue({ ...defaultValue, showNotificationMenu: false });
+        renderMenu();
+        expect(screen.queryByRole("button", { name: "Notification options" })).toBeNull();
     });
 
-    it("should display all the buttons and have the actions linked", async () => {
+    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();
 
@@ -92,7 +115,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);
@@ -107,4 +130,27 @@ describe("<RoomListItemMenuView />", () => {
         await user.click(screen.getByRole("menuitem", { name: "Leave room" }));
         expect(defaultValue.leaveRoom).toHaveBeenCalled();
     });
+
+    it("should display all the buttons and have the actions linked for the notification options menu", async () => {
+        const user = userEvent.setup();
+        renderMenu();
+
+        const openMenu = screen.getByRole("button", { name: "Notification options" });
+        await user.click(openMenu);
+
+        await user.click(screen.getByRole("menuitem", { name: "Match default settings" }));
+        expect(defaultValue.setRoomNotifState).toHaveBeenCalledWith(RoomNotifState.AllMessages);
+
+        await user.click(openMenu);
+        await user.click(screen.getByRole("menuitem", { name: "All messages" }));
+        expect(defaultValue.setRoomNotifState).toHaveBeenCalledWith(RoomNotifState.AllMessagesLoud);
+
+        await user.click(openMenu);
+        await user.click(screen.getByRole("menuitem", { name: "Mentions and keywords" }));
+        expect(defaultValue.setRoomNotifState).toHaveBeenCalledWith(RoomNotifState.MentionsOnly);
+
+        await user.click(openMenu);
+        await user.click(screen.getByRole("menuitem", { name: "Mute room" }));
+        expect(defaultValue.setRoomNotifState).toHaveBeenCalledWith(RoomNotifState.Mute);
+    });
 });
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 d08b24667b..914d33ee18 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListItemView-test.tsx
@@ -28,7 +28,6 @@ describe("<RoomListItemView />", () => {
     let defaultValue: RoomListItemViewState;
     let matrixClient: MatrixClient;
     let room: Room;
-
     beforeEach(() => {
         matrixClient = stubClient();
         room = mkRoom(matrixClient, "room1");
@@ -36,11 +35,23 @@ describe("<RoomListItemView />", () => {
         DMRoomMap.makeShared(matrixClient);
         jest.spyOn(DMRoomMap.shared(), "getUserIdForRoomId").mockReturnValue(null);
 
+        const notificationState = new RoomNotificationState(room, false);
+        jest.spyOn(notificationState, "hasAnyNotificationOrActivity", "get").mockReturnValue(true);
+        jest.spyOn(notificationState, "isNotification", "get").mockReturnValue(true);
+        jest.spyOn(notificationState, "count", "get").mockReturnValue(1);
+
         defaultValue = {
             openRoom: jest.fn(),
             showHoverMenu: false,
-            notificationState: new RoomNotificationState(room, false),
+            notificationState,
             a11yLabel: "Open room room1",
+            isBold: false,
+            isVideoRoom: false,
+            callConnectionState: null,
+            hasParticipantInCall: false,
+            name: room.name,
+            showNotificationDecoration: false,
+            messagePreview: undefined,
         };
 
         mocked(useRoomListItemViewModel).mockReturnValue(defaultValue);
@@ -52,6 +63,14 @@ describe("<RoomListItemView />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
+    test("should render a room item with a message preview", () => {
+        defaultValue.messagePreview = "The message looks list this";
+
+        const onClick = jest.fn();
+        const { asFragment } = render(<RoomListItemView room={room} onClick={onClick} isSelected={false} />);
+        expect(asFragment()).toMatchSnapshot();
+    });
+
     test("should call openRoom when clicked", async () => {
         const user = userEvent.setup();
         render(<RoomListItemView room={room} isSelected={false} />);
@@ -72,6 +91,17 @@ describe("<RoomListItemView />", () => {
         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(
@@ -80,4 +110,30 @@ describe("<RoomListItemView />", () => {
         );
         expect(asFragment()).toMatchSnapshot();
     });
+
+    test("should display notification decoration", async () => {
+        mocked(useRoomListItemViewModel).mockReturnValue({
+            ...defaultValue,
+            showNotificationDecoration: true,
+        });
+
+        const { asFragment } = render(<RoomListItemView room={room} isSelected={false} />);
+        expect(screen.getByTestId("notification-decoration")).toBeInTheDocument();
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    test("should not display notification decoration when hovered", async () => {
+        const user = userEvent.setup();
+
+        mocked(useRoomListItemViewModel).mockReturnValue({
+            ...defaultValue,
+            showNotificationDecoration: true,
+        });
+
+        render(<RoomListItemView room={room} isSelected={false} />);
+        const listItem = screen.getByRole("button", { name: `Open room ${room.name}` });
+        await user.hover(listItem);
+
+        expect(screen.queryByRole("notification-decoration")).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
new file mode 100644
index 0000000000..02ba7eb54d
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx
@@ -0,0 +1,94 @@
+/*
+ * 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 userEvent from "@testing-library/user-event";
+
+import { RoomListOptionsMenu } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListOptionsMenu";
+import { type RoomListHeaderViewState } from "../../../../../../src/components/viewmodels/roomlist/RoomListHeaderViewModel";
+
+describe("<RoomListOptionsMenu />", () => {
+    it("should match snapshot", () => {
+        const vm = {
+            sort: jest.fn(),
+        } as unknown as RoomListHeaderViewState;
+
+        const { asFragment } = render(<RoomListOptionsMenu vm={vm} />);
+
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should show A to Z selected if activeSortOption is Alphabetic", async () => {
+        const user = userEvent.setup();
+
+        const vm = {
+            sort: jest.fn(),
+            activeSortOption: "Alphabetic",
+        } as unknown as RoomListHeaderViewState;
+
+        render(<RoomListOptionsMenu vm={vm} />);
+
+        // Open the menu
+        const button = screen.getByRole("button", { name: "Room Options" });
+        await user.click(button);
+
+        expect(screen.getByRole("menuitemradio", { name: "A-Z" })).toBeChecked();
+        expect(screen.getByRole("menuitemradio", { name: "Activity" })).not.toBeChecked();
+    });
+
+    it("should show Activity selected if activeSortOption is Recency", async () => {
+        const user = userEvent.setup();
+
+        const vm = {
+            sort: jest.fn(),
+            activeSortOption: "Recency",
+        } as unknown as RoomListHeaderViewState;
+
+        render(<RoomListOptionsMenu vm={vm} />);
+
+        // Open the menu
+        const button = screen.getByRole("button", { name: "Room Options" });
+        await user.click(button);
+
+        expect(screen.getByRole("menuitemradio", { name: "A-Z" })).not.toBeChecked();
+        expect(screen.getByRole("menuitemradio", { name: "Activity" })).toBeChecked();
+    });
+
+    it("should sort A to Z", async () => {
+        const user = userEvent.setup();
+
+        const vm = {
+            sort: jest.fn(),
+        } as unknown as RoomListHeaderViewState;
+
+        render(<RoomListOptionsMenu vm={vm} />);
+
+        await user.click(screen.getByRole("button", { name: "Room Options" }));
+
+        await user.click(screen.getByRole("menuitemradio", { name: "A-Z" }));
+
+        expect(vm.sort).toHaveBeenCalledWith("Alphabetic");
+    });
+
+    it("should sort by activity", async () => {
+        const user = userEvent.setup();
+
+        const vm = {
+            sort: jest.fn(),
+            activeSortOption: "Alphabetic",
+        } as unknown as RoomListHeaderViewState;
+
+        render(<RoomListOptionsMenu vm={vm} />);
+
+        await user.click(screen.getByRole("button", { name: "Room Options" }));
+
+        await user.click(screen.getByRole("menuitemradio", { name: "Activity" }));
+
+        expect(vm.sort).toHaveBeenCalledWith("Recency");
+    });
+});
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 79bfbb6dc0..fe605ce70f 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListPrimaryFilters-test.tsx
@@ -10,9 +10,7 @@ import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
 import { type RoomListViewState } from "../../../../../../src/components/viewmodels/roomlist/RoomListViewModel";
-import { SecondaryFilters } from "../../../../../../src/components/viewmodels/roomlist/useFilteredRooms";
 import { RoomListPrimaryFilters } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListPrimaryFilters";
-import { SortOption } from "../../../../../../src/components/viewmodels/roomlist/useSorter";
 import { FilterKey } from "../../../../../../src/stores/room-list-v3/skip-list/filters";
 
 describe("<RoomListPrimaryFilters />", () => {
@@ -20,6 +18,7 @@ describe("<RoomListPrimaryFilters />", () => {
 
     beforeEach(() => {
         vm = {
+            isLoadingRooms: false,
             rooms: [],
             canCreateRoom: true,
             createRoom: jest.fn(),
@@ -28,12 +27,6 @@ describe("<RoomListPrimaryFilters />", () => {
                 { name: "People", active: false, toggle: jest.fn(), key: FilterKey.PeopleFilter },
                 { name: "Rooms", active: true, toggle: jest.fn(), key: FilterKey.RoomsFilter },
             ],
-            activateSecondaryFilter: () => {},
-            activeSecondaryFilter: SecondaryFilters.AllActivity,
-            sort: jest.fn(),
-            activeSortOption: SortOption.Activity,
-            shouldShowMessagePreview: false,
-            toggleMessagePreview: jest.fn(),
             activeIndex: undefined,
         };
     });
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 f56d30976a..4ebe6fc4c7 100644
--- a/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/RoomListView-test.tsx
@@ -13,8 +13,6 @@ import {
     type RoomListViewState,
     useRoomListViewModel,
 } from "../../../../../../src/components/viewmodels/roomlist/RoomListViewModel";
-import { SecondaryFilters } from "../../../../../../src/components/viewmodels/roomlist/useFilteredRooms";
-import { SortOption } from "../../../../../../src/components/viewmodels/roomlist/useSorter";
 import { RoomListView } from "../../../../../../src/components/views/rooms/RoomListPanel/RoomListView";
 import { mkRoom, stubClient } from "../../../../../test-utils";
 
@@ -24,17 +22,12 @@ jest.mock("../../../../../../src/components/viewmodels/roomlist/RoomListViewMode
 
 describe("<RoomListView />", () => {
     const defaultValue: RoomListViewState = {
+        isLoadingRooms: false,
         rooms: [],
         primaryFilters: [],
-        activateSecondaryFilter: jest.fn().mockReturnValue({}),
-        activeSecondaryFilter: SecondaryFilters.AllActivity,
-        sort: jest.fn(),
-        activeSortOption: SortOption.Activity,
         createRoom: jest.fn(),
         createChatRoom: jest.fn(),
         canCreateRoom: true,
-        toggleMessagePreview: jest.fn(),
-        shouldShowMessagePreview: false,
         activeIndex: undefined,
     };
     const matrixClient = stubClient();
@@ -43,6 +36,16 @@ describe("<RoomListView />", () => {
         jest.resetAllMocks();
     });
 
+    it("should render the loading room list", () => {
+        mocked(useRoomListViewModel).mockReturnValue({
+            ...defaultValue,
+            isLoadingRooms: true,
+        });
+
+        const roomList = render(<RoomListView />);
+        expect(roomList.container.querySelector(".mx_RoomListSkeleton")).not.toBeNull();
+    });
+
     it("should render an empty room list", () => {
         mocked(useRoomListViewModel).mockReturnValue(defaultValue);
 
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 bf1733c2ed..1e6fb38ab1 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
@@ -63,6 +63,56 @@ exports[`<EmptyRoomList /> should display empty state for filter rooms 1`] = `
 </DocumentFragment>
 `;
 
+exports[`<EmptyRoomList /> should display the empty state for the invite filter 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_Flex 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 unread invites
+    </span>
+    <button
+      class="_button_vczzf_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 mention filter 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_Flex 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 unread mentions
+    </span>
+    <button
+      class="_button_vczzf_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 unread filter 1`] = `
 <DocumentFragment>
   <div
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 2417527ac7..3ab510bfca 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
@@ -15,7 +15,7 @@ exports[`<RoomList /> should render a room list 1`] = `
         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="0"
+        tabindex="-1"
       >
         <div
           class="ReactVirtualized__Grid__innerScrollContainer"
@@ -25,470 +25,520 @@ exports[`<RoomList /> should render a room list 1`] = `
           <button
             aria-label="Open room room0"
             aria-selected="false"
-            class="mx_RoomListItemView mx_RoomListItemView_empty"
+            class="mx_RoomListItemView"
             role="gridcell"
             style="height: 48px; left: 0px; position: absolute; top: 0px; width: 100%;"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="2"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room0"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room0
-                </span>
+                  <div
+                    class="mx_RoomListItemView_roomName"
+                    title="room0"
+                  >
+                    room0
+                  </div>
+                  <div
+                    class="mx_RoomListItemView_messagePreview"
+                  />
+                </div>
               </div>
             </div>
           </button>
           <button
             aria-label="Open room room1"
             aria-selected="false"
-            class="mx_RoomListItemView mx_RoomListItemView_empty"
+            class="mx_RoomListItemView"
             role="gridcell"
             style="height: 48px; left: 0px; position: absolute; top: 48px; 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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="3"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room1"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room1
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="4"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room2"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room2
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="5"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room3"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room3
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="6"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room4"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room4
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="1"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room5"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room5
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="2"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room6"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room6
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="3"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room7"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room7
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="4"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room8"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room8
-                </span>
+                  <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 mx_RoomListItemView_empty"
+            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;"
             >
-              <div
-                class="mx_DecoratedRoomAvatar"
+              <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;"
               >
-                <span
-                  aria-label="Avatar"
-                  class="_avatar_1qbcf_8 mx_BaseAvatar"
-                  data-color="5"
-                  data-testid="avatar-img"
+                <img
+                  alt=""
+                  class="_image_1qbcf_41"
                   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>
+                  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-3x); --mx-flex-wrap: nowrap;"
+                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;"
               >
-                <span
-                  title="room9"
+                <div
+                  class="mx_RoomListItemView_text"
                 >
-                  room9
-                </span>
+                  <div
+                    class="mx_RoomListItemView_roomName"
+                    title="room9"
+                  >
+                    room9
+                  </div>
+                  <div
+                    class="mx_RoomListItemView_messagePreview"
+                  />
+                </div>
               </div>
             </div>
           </button>
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 731a333f75..1291ef91ea 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
@@ -24,7 +24,7 @@ exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`]
         aria-label="Open space menu"
         class="_icon-button_m2erp_8 mx_SpaceMenu_button"
         data-state="closed"
-        id="radix-:r0:"
+        id="radix-«rc»"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
@@ -35,6 +35,7 @@ exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`]
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
+            color="var(--cpd-color-icon-secondary)"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -48,41 +49,79 @@ exports[`<RoomListHeaderView /> compose menu should display the compose menu 1`]
         </div>
       </button>
     </div>
-    <button
-      aria-disabled="false"
-      aria-expanded="false"
-      aria-haspopup="menu"
-      aria-label="Add"
-      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_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;"
     >
-      <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="«rg»"
+        class="_icon-button_m2erp_8"
+        data-state="closed"
+        id="radix-«re»"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="0"
+        type="button"
       >
-        <svg
-          fill="currentColor"
-          height="1em"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
+        <div
+          class="_indicator-icon_zr2a0_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
+            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>
+      <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"
+      >
+        <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>
 </DocumentFragment>
 `;
@@ -111,7 +150,7 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
         aria-label="Open space menu"
         class="_icon-button_m2erp_8 mx_SpaceMenu_button"
         data-state="closed"
-        id="radix-:r4:"
+        id="radix-«ro»"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
@@ -122,6 +161,7 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
+            color="var(--cpd-color-icon-secondary)"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -135,35 +175,199 @@ exports[`<RoomListHeaderView /> compose menu should not display the compose menu
         </div>
       </button>
     </div>
-    <button
-      aria-label="New message"
-      class="_icon-button_m2erp_8"
-      role="button"
-      style="--cpd-icon-button-size: 32px;"
-      tabindex="0"
+    <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;"
     >
-      <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="«rs»"
+        class="_icon-button_m2erp_8"
+        data-state="closed"
+        id="radix-«rq»"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="0"
+        type="button"
       >
-        <svg
-          fill="currentColor"
-          height="1em"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
+        <div
+          class="_indicator-icon_zr2a0_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
+            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>
+      <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>
+</DocumentFragment>
+`;
+
+exports[`<RoomListHeaderView /> should render 'room options' button 1`] = `
+<DocumentFragment>
+  <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="title"
+      >
+        title
+      </h1>
+      <button
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
+        aria-label="Open space menu"
+        class="_icon-button_m2erp_8 mx_SpaceMenu_button"
+        data-state="closed"
+        id="radix-«r0»"
+        role="button"
+        style="--cpd-icon-button-size: 20px;"
+        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="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>
+      </button>
+    </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="«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="_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="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="Add"
+        class="_icon-button_m2erp_8"
+        data-state="closed"
+        id="radix-«r9»"
+        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>
 </DocumentFragment>
 `;
@@ -192,7 +396,7 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
         aria-label="Open space menu"
         class="_icon-button_m2erp_8 mx_SpaceMenu_button"
         data-state="closed"
-        id="radix-:rs:"
+        id="radix-«r28»"
         role="button"
         style="--cpd-icon-button-size: 20px;"
         tabindex="0"
@@ -203,6 +407,7 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
           style="--cpd-icon-button-size: 100%;"
         >
           <svg
+            color="var(--cpd-color-icon-secondary)"
             fill="currentColor"
             height="1em"
             viewBox="0 0 24 24"
@@ -216,41 +421,79 @@ exports[`<RoomListHeaderView /> space menu should display the space menu 1`] = `
         </div>
       </button>
     </div>
-    <button
-      aria-disabled="false"
-      aria-expanded="false"
-      aria-haspopup="menu"
-      aria-label="Add"
-      class="_icon-button_m2erp_8"
-      data-state="closed"
-      id="radix-:ru:"
-      role="button"
-      style="--cpd-icon-button-size: 32px;"
-      tabindex="0"
-      type="button"
+    <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;"
     >
-      <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="«r2c»"
+        class="_icon-button_m2erp_8"
+        data-state="closed"
+        id="radix-«r2a»"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="0"
+        type="button"
       >
-        <svg
-          fill="currentColor"
-          height="1em"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
+        <div
+          class="_indicator-icon_zr2a0_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
+            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>
+      <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"
+      >
+        <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>
 </DocumentFragment>
 `;
@@ -273,41 +516,79 @@ exports[`<RoomListHeaderView /> space menu should not display the space menu 1`]
         title
       </h1>
     </div>
-    <button
-      aria-disabled="false"
-      aria-expanded="false"
-      aria-haspopup="menu"
-      aria-label="Add"
-      class="_icon-button_m2erp_8"
-      data-state="closed"
-      id="radix-:r10:"
-      role="button"
-      style="--cpd-icon-button-size: 32px;"
-      tabindex="0"
-      type="button"
+    <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;"
     >
-      <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="«r2m»"
+        class="_icon-button_m2erp_8"
+        data-state="closed"
+        id="radix-«r2k»"
+        role="button"
+        style="--cpd-icon-button-size: 32px;"
+        tabindex="0"
+        type="button"
       >
-        <svg
-          fill="currentColor"
-          height="1em"
-          viewBox="0 0 24 24"
-          width="1em"
-          xmlns="http://www.w3.org/2000/svg"
+        <div
+          class="_indicator-icon_zr2a0_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
+            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>
+      <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"
+      >
+        <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>
 </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 0910706d9b..7bb17cbd4f 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
@@ -4,17 +4,17 @@ exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
 <DocumentFragment>
   <div
     class="mx_Flex 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-0-5x); --mx-flex-wrap: nowrap;"
+    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
       aria-disabled="false"
       aria-expanded="false"
       aria-haspopup="menu"
       aria-label="More Options"
-      aria-labelledby=":r2:"
+      aria-labelledby="«r2»"
       class="_icon-button_m2erp_8"
       data-state="closed"
-      id="radix-:r0:"
+      id="radix-«r0»"
       role="button"
       style="--cpd-icon-button-size: 24px;"
       tabindex="0"
@@ -37,6 +37,115 @@ exports[`<RoomListItemMenuView /> should render the more options menu 1`] = `
         </svg>
       </div>
     </button>
+    <button
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="Notification options"
+      aria-labelledby="«r9»"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-«r7»"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <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="m4.917 2.083 17 17a1 1 0 0 1-1.414 1.414L19.006 19H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-2.034 1.096-3.91L3.504 3.498a1 1 0 0 1 1.414-1.414M19 13.35 9.136 3.484C9.93 3.181 10.874 3 12 3c7 0 7 7 7 7z"
+          />
+          <path
+            d="M10 20h4a2 2 0 0 1-4 0"
+          />
+        </svg>
+      </div>
+    </button>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`<RoomListItemMenuView /> should render the notification options menu 1`] = `
+<DocumentFragment>
+  <div
+    class="mx_Flex 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
+      aria-disabled="false"
+      aria-expanded="false"
+      aria-haspopup="menu"
+      aria-label="More Options"
+      aria-labelledby="«ri»"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-«rg»"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <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="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="«rp»"
+      class="_icon-button_m2erp_8"
+      data-state="closed"
+      id="radix-«rn»"
+      role="button"
+      style="--cpd-icon-button-size: 24px;"
+      tabindex="0"
+      type="button"
+    >
+      <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="m4.917 2.083 17 17a1 1 0 0 1-1.414 1.414L19.006 19H4.414c-.89 0-1.337-1.077-.707-1.707L5 16v-6s0-2.034 1.096-3.91L3.504 3.498a1 1 0 0 1 1.414-1.414M19 13.35 9.136 3.484C9.93 3.181 10.874 3 12 3c7 0 7 7 7 7z"
+          />
+          <path
+            d="M10 20h4a2 2 0 0 1-4 0"
+          />
+        </svg>
+      </div>
+    </button>
   </div>
 </DocumentFragment>
 `;
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 b9c01ccec8..4340cb4200 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
@@ -5,45 +5,117 @@ exports[`<RoomListItemView /> should be selected if isSelected=true 1`] = `
   <button
     aria-label="Open room room1"
     aria-selected="true"
-    class="mx_RoomListItemView mx_RoomListItemView_empty mx_RoomListItemView_selected"
+    class="mx_RoomListItemView mx_RoomListItemView_selected"
+    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;"
     >
-      <div
-        class="mx_DecoratedRoomAvatar"
+      <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;"
       >
-        <span
-          aria-label="Avatar"
-          class="_avatar_1qbcf_8 mx_BaseAvatar"
-          data-color="3"
-          data-testid="avatar-img"
+        <img
+          alt=""
+          class="_image_1qbcf_41"
           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>
+          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-3x); --mx-flex-wrap: nowrap;"
+        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;"
       >
-        <span
-          title="room1"
+        <div
+          class="mx_RoomListItemView_text"
         >
-          room1
-        </span>
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room1"
+          >
+            room1
+          </div>
+          <div
+            class="mx_RoomListItemView_messagePreview"
+          />
+        </div>
+      </div>
+    </div>
+  </button>
+</DocumentFragment>
+`;
+
+exports[`<RoomListItemView /> should display notification decoration 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Open room room1"
+    aria-selected="false"
+    class="mx_RoomListItemView"
+    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="room1"
+          >
+            room1
+          </div>
+          <div
+            class="mx_RoomListItemView_messagePreview"
+          />
+        </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;"
+        >
+          <span
+            class="_unread-counter_9mg0k_8"
+          >
+            1
+          </span>
+        </div>
       </div>
     </div>
   </button>
@@ -55,45 +127,107 @@ exports[`<RoomListItemView /> should render a room item 1`] = `
   <button
     aria-label="Open room room1"
     aria-selected="false"
-    class="mx_RoomListItemView mx_RoomListItemView_empty"
+    class="mx_RoomListItemView"
+    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;"
     >
-      <div
-        class="mx_DecoratedRoomAvatar"
+      <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;"
       >
-        <span
-          aria-label="Avatar"
-          class="_avatar_1qbcf_8 mx_BaseAvatar"
-          data-color="3"
-          data-testid="avatar-img"
+        <img
+          alt=""
+          class="_image_1qbcf_41"
           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>
+          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-3x); --mx-flex-wrap: nowrap;"
+        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;"
       >
-        <span
-          title="room1"
+        <div
+          class="mx_RoomListItemView_text"
         >
-          room1
-        </span>
+          <div
+            class="mx_RoomListItemView_roomName"
+            title="room1"
+          >
+            room1
+          </div>
+          <div
+            class="mx_RoomListItemView_messagePreview"
+          />
+        </div>
+      </div>
+    </div>
+  </button>
+</DocumentFragment>
+`;
+
+exports[`<RoomListItemView /> should render a room item with a message preview 1`] = `
+<DocumentFragment>
+  <button
+    aria-label="Open room room1"
+    aria-selected="false"
+    class="mx_RoomListItemView"
+    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="room1"
+          >
+            room1
+          </div>
+          <div
+            class="mx_RoomListItemView_messagePreview"
+          >
+            The message looks list this
+          </div>
+        </div>
       </div>
     </div>
   </button>
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
new file mode 100644
index 0000000000..6b75053753
--- /dev/null
+++ b/test/unit-tests/components/views/rooms/RoomListPanel/__snapshots__/RoomListOptionsMenu-test.tsx.snap
@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<RoomListOptionsMenu /> should match snapshot 1`] = `
+<DocumentFragment>
+  <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="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>
+</DocumentFragment>
+`;
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
index df3f60dcf4..7708ab1adb 100644
--- 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
@@ -23,35 +23,73 @@ exports[`<RoomListPanel /> should not render the RoomListSearch component when U
           Home
         </h1>
       </div>
-      <button
-        aria-label="New message"
-        class="_icon-button_m2erp_8"
-        role="button"
-        style="--cpd-icon-button-size: 32px;"
-        tabindex="0"
+      <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;"
       >
-        <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="«rc»"
+          class="_icon-button_m2erp_8"
+          data-state="closed"
+          id="radix-«ra»"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_zr2a0_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
+              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>
+        <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"
@@ -69,20 +107,7 @@ exports[`<RoomListPanel /> should not render the RoomListSearch component when U
           role="button"
           tabindex="0"
         >
-          Unread
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Favourites
+          Unreads
         </button>
       </li>
       <li
@@ -111,49 +136,62 @@ exports[`<RoomListPanel /> should not render the RoomListSearch component when U
           Rooms
         </button>
       </li>
-    </ul>
-    <div
-      class="mx_Flex 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"
-      >
-        No chats yet
-      </span>
-      <span
-        class="mx_EmptyRoomList_GenericPlaceholder_description"
-      >
-        Get started by messaging someone
-      </span>
-      <div
-        class="mx_Flex 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;"
+      <li
+        aria-selected="false"
+        role="option"
       >
         <button
-          class="_button_vczzf_8 _has-icon_vczzf_57"
-          data-kind="secondary"
-          data-size="sm"
+          aria-selected="false"
+          class="_chat-filter_5qdp0_8"
           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="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>
-          New message
+          Mentions
         </button>
-      </div>
-    </div>
+      </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>
+      <li
+        aria-selected="false"
+        role="option"
+      >
+        <button
+          aria-selected="false"
+          class="_chat-filter_5qdp0_8"
+          role="button"
+          tabindex="0"
+        >
+          Low priority
+        </button>
+      </li>
+    </ul>
+    <div
+      class="mx_RoomListSkeleton"
+    />
   </section>
 </DocumentFragment>
 `;
@@ -193,7 +231,11 @@ exports[`<RoomListPanel /> should render the RoomListSearch component when UICom
           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;"
         >
-          Search
+          <span
+            class="mx_RoomListSearch_search_text"
+          >
+            Search
+          </span>
           <kbd>
             Ctrl K
           </kbd>
@@ -237,41 +279,79 @@ exports[`<RoomListPanel /> should render the RoomListSearch component when UICom
           Home
         </h1>
       </div>
-      <button
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="menu"
-        aria-label="Add"
-        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="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;"
       >
-        <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="«r2»"
+          class="_icon-button_m2erp_8"
+          data-state="closed"
+          id="radix-«r0»"
+          role="button"
+          style="--cpd-icon-button-size: 32px;"
+          tabindex="0"
+          type="button"
         >
-          <svg
-            fill="currentColor"
-            height="1em"
-            viewBox="0 0 24 24"
-            width="1em"
-            xmlns="http://www.w3.org/2000/svg"
+          <div
+            class="_indicator-icon_zr2a0_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
+              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>
+        <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"
@@ -289,20 +369,7 @@ exports[`<RoomListPanel /> should render the RoomListSearch component when UICom
           role="button"
           tabindex="0"
         >
-          Unread
-        </button>
-      </li>
-      <li
-        aria-selected="false"
-        role="option"
-      >
-        <button
-          aria-selected="false"
-          class="_chat-filter_5qdp0_8"
-          role="button"
-          tabindex="0"
-        >
-          Favourites
+          Unreads
         </button>
       </li>
       <li
@@ -331,70 +398,62 @@ exports[`<RoomListPanel /> should render the RoomListSearch component when UICom
           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>
+      <li
+        aria-selected="false"
+        role="option"
+      >
+        <button
+          aria-selected="false"
+          class="_chat-filter_5qdp0_8"
+          role="button"
+          tabindex="0"
+        >
+          Low priority
+        </button>
+      </li>
     </ul>
     <div
-      class="mx_Flex 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"
-      >
-        No chats yet
-      </span>
-      <span
-        class="mx_EmptyRoomList_GenericPlaceholder_description"
-      >
-        Get started by messaging someone or by creating a room
-      </span>
-      <div
-        class="mx_Flex 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"
-          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="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>
-          New message
-        </button>
-        <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="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>
-          New room
-        </button>
-      </div>
-    </div>
+      class="mx_RoomListSkeleton"
+    />
   </section>
 </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 5efa931a3b..e52842ba3a 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
@@ -30,7 +30,11 @@ exports[`<RoomListSearch /> should display search and explore buttons 1`] = `
         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;"
       >
-        Search
+        <span
+          class="mx_RoomListSearch_search_text"
+        >
+          Search
+        </span>
         <kbd>
           Ctrl K
         </kbd>
@@ -91,7 +95,11 @@ exports[`<RoomListSearch /> should display the dial button when the PTSN protoco
         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;"
       >
-        Search
+        <span
+          class="mx_RoomListSearch_search_text"
+        >
+          Search
+        </span>
         <kbd>
           Ctrl K
         </kbd>
@@ -173,7 +181,11 @@ exports[`<RoomListSearch /> should hide the explore button when UIComponent.Expl
         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;"
       >
-        Search
+        <span
+          class="mx_RoomListSearch_search_text"
+        >
+          Search
+        </span>
         <kbd>
           Ctrl K
         </kbd>
@@ -213,7 +225,11 @@ exports[`<RoomListSearch /> should hide the explore button when the active space
         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;"
       >
-        Search
+        <span
+          class="mx_RoomListSearch_search_text"
+        >
+          Search
+        </span>
         <kbd>
           Ctrl K
         </kbd>
diff --git a/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx b/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
index 2eb0581ff3..fb6691af78 100644
--- a/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomPreviewBar-test.tsx
@@ -279,37 +279,31 @@ describe("<RoomPreviewBar />", () => {
                 });
 
                 it("renders join and reject action buttons correctly", () => {
-                    const component = getComponent({ inviterName, room, onJoinClick, onRejectClick });
-                    expect(getActions(component)).toMatchSnapshot();
-                });
-
-                it("renders reject and ignore action buttons when handler is provided", () => {
-                    const onRejectAndIgnoreClick = jest.fn();
-                    const component = getComponent({
-                        inviterName,
-                        room,
-                        onJoinClick,
-                        onRejectClick,
-                        onRejectAndIgnoreClick,
-                    });
+                    const component = getComponent({ inviterName, room, onJoinClick, onDeclineClick: onRejectClick });
                     expect(getActions(component)).toMatchSnapshot();
                 });
 
                 it("renders join and reject action buttons in reverse order when room can previewed", () => {
                     // when room is previewed action buttons are rendered left to right, with primary on the right
-                    const component = getComponent({ inviterName, room, onJoinClick, onRejectClick, canPreview: true });
+                    const component = getComponent({
+                        inviterName,
+                        room,
+                        onJoinClick,
+                        onDeclineClick: onRejectClick,
+                        canPreview: true,
+                    });
                     expect(getActions(component)).toMatchSnapshot();
                 });
 
                 it("joins room on primary button click", () => {
-                    const component = getComponent({ inviterName, room, onJoinClick, onRejectClick });
+                    const component = getComponent({ inviterName, room, onJoinClick, onDeclineClick: onRejectClick });
                     fireEvent.click(getPrimaryActionButton(component)!);
 
                     expect(onJoinClick).toHaveBeenCalled();
                 });
 
                 it("rejects invite on secondary button click", () => {
-                    const component = getComponent({ inviterName, room, onJoinClick, onRejectClick });
+                    const component = getComponent({ inviterName, room, onJoinClick, onDeclineClick: onRejectClick });
                     fireEvent.click(getSecondaryActionButton(component)!);
 
                     expect(onRejectClick).toHaveBeenCalled();
@@ -337,18 +331,6 @@ describe("<RoomPreviewBar />", () => {
                     const component = getComponent({ inviterName, room });
                     expect(getMessage(component)).toMatchSnapshot();
                 });
-
-                it("renders join and reject action buttons with correct labels", () => {
-                    const onRejectAndIgnoreClick = jest.fn();
-                    const component = getComponent({
-                        inviterName,
-                        room,
-                        onJoinClick,
-                        onRejectAndIgnoreClick,
-                        onRejectClick,
-                    });
-                    expect(getActions(component)).toMatchSnapshot();
-                });
             });
         });
 
@@ -364,7 +346,7 @@ describe("<RoomPreviewBar />", () => {
                 async () => {
                     const onJoinClick = jest.fn();
                     const onRejectClick = jest.fn();
-                    const component = getComponent({ ...props, onJoinClick, onRejectClick });
+                    const component = getComponent({ ...props, onJoinClick, onDeclineClick: onRejectClick });
                     await waitFor(() => expect(getPrimaryActionButton(component)).toBeTruthy());
                     if (expectSecondaryButton) expect(getSecondaryActionButton(component)).toBeFalsy();
                     fireEvent.click(getPrimaryActionButton(component)!);
diff --git a/test/unit-tests/components/views/rooms/RoomPreviewCard-test.tsx b/test/unit-tests/components/views/rooms/RoomPreviewCard-test.tsx
index 375366e8f9..e12fabeb3f 100644
--- a/test/unit-tests/components/views/rooms/RoomPreviewCard-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomPreviewCard-test.tsx
@@ -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
@@ -44,9 +44,13 @@ describe("RoomPreviewCard", () => {
         client.reEmitter.reEmit(room, [RoomStateEvent.Events]);
 
         enabledFeatures = [];
-        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName): any =>
-            enabledFeatures.includes(settingName) ? true : undefined,
-        );
+        const origFn = SettingsStore.getValue;
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName): any => {
+            if (enabledFeatures.includes(settingName)) {
+                return true;
+            }
+            return origFn(settingName);
+        });
     });
 
     afterEach(() => {
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 b2b9502a5b..5d400fba98 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
@@ -5,7 +5,7 @@ exports[`<NotificationDecoration /> should render the activity decoration 1`] =
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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"
@@ -21,13 +21,19 @@ exports[`<NotificationDecoration /> should render the invitation decoration 1`]
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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_1ibqq_8"
+    <svg
+      fill="var(--cpd-color-icon-accent-primary)"
+      height="20px"
+      viewBox="0 0 24 24"
+      width="20px"
+      xmlns="http://www.w3.org/2000/svg"
     >
-      1
-    </span>
+      <path
+        d="M4 4h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2m0 5.111a1 1 0 0 0 .514.874l7 3.89a1 1 0 0 0 .972 0l7-3.89a1 1 0 1 0-.972-1.748L12 11.856 5.486 8.237A1 1 0 0 0 4 9.111"
+      />
+    </svg>
   </div>
 </DocumentFragment>
 `;
@@ -37,7 +43,7 @@ exports[`<NotificationDecoration /> should render the mention decoration 1`] = `
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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)"
@@ -51,7 +57,7 @@ exports[`<NotificationDecoration /> should render the mention decoration 1`] = `
       />
     </svg>
     <span
-      class="_unread-counter_1ibqq_8"
+      class="_unread-counter_9mg0k_8"
     >
       1
     </span>
@@ -64,7 +70,7 @@ exports[`<NotificationDecoration /> should render the muted decoration 1`] = `
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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-tertiary)"
@@ -89,10 +95,10 @@ exports[`<NotificationDecoration /> should render the notification decoration 1`
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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_1ibqq_8"
+      class="_unread-counter_9mg0k_8"
     >
       1
     </span>
@@ -105,10 +111,10 @@ exports[`<NotificationDecoration /> should render the notification decoration wi
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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_1ibqq_8"
+      class="_unread-counter_9mg0k_8"
     />
   </div>
 </DocumentFragment>
@@ -119,7 +125,7 @@ exports[`<NotificationDecoration /> should render the unset message decoration 1
   <div
     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-1-5x); --mx-flex-wrap: nowrap;"
+    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-critical-primary)"
@@ -129,7 +135,29 @@ exports[`<NotificationDecoration /> should render the unset message decoration 1
       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"
+        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>
+</DocumentFragment>
+`;
+
+exports[`<NotificationDecoration /> should render the video decoration 1`] = `
+<DocumentFragment>
+  <div
+    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
+      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"
       />
     </svg>
   </div>
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 bb22f55b2f..84a4da73ef 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
@@ -25,7 +25,7 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
         class="mx_PinnedEventTile_top"
       >
         <span
-          aria-labelledby=":r0:"
+          aria-labelledby="«r0»"
           class="mx_PinnedEventTile_sender mx_Username_color2"
         >
           @alice:server.org
@@ -37,7 +37,7 @@ exports[`<PinnedEventTile /> should render pinned event 1`] = `
           aria-label="Open menu"
           class="_icon-button_m2erp_8"
           data-state="closed"
-          id="radix-:r5:"
+          id="radix-«r5»"
           role="button"
           style="--cpd-icon-button-size: 24px;"
           tabindex="0"
@@ -101,7 +101,7 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
         class="mx_PinnedEventTile_top"
       >
         <span
-          aria-labelledby=":r8:"
+          aria-labelledby="«r8»"
           class="mx_PinnedEventTile_sender mx_Username_color2"
         >
           @alice:server.org
@@ -113,7 +113,7 @@ exports[`<PinnedEventTile /> should render pinned event with thread info 1`] = `
           aria-label="Open menu"
           class="_icon-button_m2erp_8"
           data-state="closed"
-          id="radix-:rd:"
+          id="radix-«rd»"
           role="button"
           style="--cpd-icon-button-size: 24px;"
           tabindex="0"
@@ -181,7 +181,7 @@ 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-«r10»"
   aria-orientation="vertical"
   class="_menu_19sse_8"
   data-align="start"
@@ -190,13 +190,13 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
   data-side="right"
   data-state="open"
   dir="ltr"
-  id="radix-:r11:"
+  id="radix-«r11»"
   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"
 >
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="primary"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -205,7 +205,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -217,13 +217,13 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       View in timeline
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
@@ -236,7 +236,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
     </svg>
   </button>
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="primary"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -245,7 +245,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -262,13 +262,13 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       Unpin
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
@@ -281,7 +281,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
     </svg>
   </button>
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="primary"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -290,7 +290,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -302,13 +302,13 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       Forward
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
@@ -327,7 +327,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
     role="separator"
   />
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="critical"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -336,7 +336,7 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -348,13 +348,13 @@ exports[`<PinnedEventTile /> should render the menu with all the options 1`] = `
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       Delete
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
@@ -372,7 +372,7 @@ 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-«rl»"
   aria-orientation="vertical"
   class="_menu_19sse_8"
   data-align="start"
@@ -381,13 +381,13 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
   data-side="right"
   data-state="open"
   dir="ltr"
-  id="radix-:rm:"
+  id="radix-«rm»"
   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"
 >
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="primary"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -396,7 +396,7 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -408,13 +408,13 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       View in timeline
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
@@ -427,7 +427,7 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
     </svg>
   </button>
   <button
-    class="_item_1x5l4_8 _interactive_1x5l4_26"
+    class="_item_dyt4i_8 _interactive_dyt4i_26"
     data-kind="primary"
     data-orientation="vertical"
     data-radix-collection-item=""
@@ -436,7 +436,7 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
   >
     <svg
       aria-hidden="true"
-      class="_icon_1x5l4_34"
+      class="_icon_dyt4i_50"
       fill="currentColor"
       height="24"
       viewBox="0 0 24 24"
@@ -448,13 +448,13 @@ exports[`<PinnedEventTile /> should render the menu without unpin and delete 1`]
       />
     </svg>
     <span
-      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+      class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
     >
       Forward
     </span>
     <svg
       aria-hidden="true"
-      class="_nav-hint_1x5l4_50"
+      class="_nav-hint_dyt4i_59"
       fill="currentColor"
       height="24"
       viewBox="8 0 8 24"
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 97b9893e82..1778426866 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
@@ -4,7 +4,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
 <div
   class="_tooltip_6ode6_8"
   data-floating-ui-focusable=""
-  id=":r6:"
+  id="«r6»"
   role="tooltip"
   style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
   tabindex="-1"
@@ -22,7 +22,7 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
       stroke="none"
     />
     <clippath
-      id=":r9:"
+      id="«r9»"
     >
       <rect
         height="10"
@@ -33,13 +33,13 @@ exports[`ReadReceiptGroup <ReadReceiptPerson /> should display a tooltip 1`] = `
     </clippath>
   </svg>
   <span
-    id=":r4:"
+    id="«r4»"
   >
     Alice
   </span>
   <span
     class="_caption_6ode6_28 cpd-theme-dark"
-    id=":r5:"
+    id="«r5»"
   >
     @alice:example.org
   </span>
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 e89552dd85..dc44db8d21 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
@@ -339,34 +339,6 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a dm roo
 </div>
 `;
 
-exports[`<RoomPreviewBar /> with an invite without an invited email for a dm room renders join and reject action buttons with correct labels 1`] = `
-<div
-  class="mx_RoomPreviewBar_actions"
->
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
-    role="button"
-    tabindex="0"
-  >
-    Start chatting
-  </div>
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
-    role="button"
-    tabindex="0"
-  >
-    Reject & Ignore user
-  </div>
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
-    role="button"
-    tabindex="0"
-  >
-    Reject
-  </div>
-</div>
-`;
-
 exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm room renders invite message 1`] = `
 <div
   class="mx_RoomPreviewBar_message"
@@ -421,7 +393,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
     role="button"
     tabindex="0"
   >
-    Reject
+    Decline
   </div>
 </div>
 `;
@@ -435,7 +407,7 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
     role="button"
     tabindex="0"
   >
-    Reject
+    Decline
   </div>
   <div
     class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
@@ -446,31 +418,3 @@ exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm
   </div>
 </div>
 `;
-
-exports[`<RoomPreviewBar /> with an invite without an invited email for a non-dm room renders reject and ignore action buttons when handler is provided 1`] = `
-<div
-  class="mx_RoomPreviewBar_actions"
->
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary"
-    role="button"
-    tabindex="0"
-  >
-    Accept
-  </div>
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
-    role="button"
-    tabindex="0"
-  >
-    Reject & Ignore user
-  </div>
-  <div
-    class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_secondary"
-    role="button"
-    tabindex="0"
-  >
-    Reject
-  </div>
-</div>
-`;
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 3ecc2a47b7..75d559f390 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
@@ -19,7 +19,7 @@ exports[`<ThirdPartyMemberInfo /> should render invite 1`] = `
         </p>
       </div>
       <button
-        aria-labelledby=":r0:"
+        aria-labelledby="«r0»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
@@ -93,7 +93,7 @@ exports[`<ThirdPartyMemberInfo /> should render invite when room in not availabl
         </p>
       </div>
       <button
-        aria-labelledby=":r6:"
+        aria-labelledby="«r6»"
         class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
         data-testid="base-card-close-button"
         role="button"
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 16b9cdaf89..b4ab471cc0 100644
--- a/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/MemberListHeaderView-test.tsx
@@ -11,8 +11,8 @@ 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 type React from "react";
 import { shouldShowComponent } from "../../../../../../src/customisations/helpers/UIComponents";
 import defaultDispatcher from "../../../../../../src/dispatcher/dispatcher";
 import { type Rendered, renderMemberList } from "./common";
@@ -21,7 +21,7 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
 }));
 
-type Children = (args: { height: number; width: number }) => React.JSX.Element;
+type Children = (args: { height: number; width: number }) => JSX.Element;
 jest.mock("react-virtualized", () => {
     const ReactVirtualized = jest.requireActual("react-virtualized");
     return {
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 5877416dae..240ad8a502 100644
--- a/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx
+++ b/test/unit-tests/components/views/rooms/memberlist/MemberListView-test.tsx
@@ -10,8 +10,8 @@ Please see LICENSE files in the repository root for full details.
 import { act } from "react";
 import { waitFor } from "jest-matrix-react";
 import { type Room, type RoomMember, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { type JSX } from "react";
 
-import type React from "react";
 import { filterConsole } from "../../../../../test-utils";
 import { type Rendered, renderMemberList } from "./common";
 
@@ -19,7 +19,7 @@ jest.mock("../../../../../../src/customisations/helpers/UIComponents", () => ({
     shouldShowComponent: jest.fn(),
 }));
 
-type Children = (args: { height: number; width: number }) => React.JSX.Element;
+type Children = (args: { height: number; width: number }) => JSX.Element;
 jest.mock("react-virtualized", () => {
     const ReactVirtualized = jest.requireActual("react-virtualized");
     return {
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 16aed90ee6..f4c503c403 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
@@ -47,7 +47,7 @@ exports[`MemberTileView RoomMemberTileView should display an verified E2EIcon wh
         class="mx_MemberTileView_right"
       >
         <div
-          aria-labelledby=":ri:"
+          aria-labelledby="«ri»"
           class="mx_E2EIconView"
         >
           <svg
@@ -116,7 +116,7 @@ exports[`MemberTileView RoomMemberTileView should display an warning E2EIcon whe
         class="mx_MemberTileView_right"
       >
         <div
-          aria-labelledby=":r8:"
+          aria-labelledby="«r8»"
           class="mx_E2EIconView"
         >
           <svg
diff --git a/test/unit-tests/components/views/settings/AddPrivilegedUsers-test.tsx b/test/unit-tests/components/views/settings/AddPrivilegedUsers-test.tsx
index e64752c5ab..2088bccc17 100644
--- a/test/unit-tests/components/views/settings/AddPrivilegedUsers-test.tsx
+++ b/test/unit-tests/components/views/settings/AddPrivilegedUsers-test.tsx
@@ -84,12 +84,12 @@ describe("<AddPrivilegedUsers />", () => {
         // Find some suggestions and select them.
         const autocompleteInput = getByTestId("autocomplete-input");
 
-        act(() => {
+        await act(async () => {
             fireEvent.focus(autocompleteInput);
             fireEvent.change(autocompleteInput, { target: { value: "u" } });
+            await waitFor(() => expect(provider.mock.instances[0].getCompletions).toHaveBeenCalledTimes(1));
         });
 
-        await waitFor(() => expect(provider.mock.instances[0].getCompletions).toHaveBeenCalledTimes(1));
         const matchOne = getByTestId("autocomplete-suggestion-item-@user_1:host.local");
         const matchTwo = getByTestId("autocomplete-suggestion-item-@user_2:host.local");
 
diff --git a/test/unit-tests/components/views/settings/CrossSigningPanel-test.tsx b/test/unit-tests/components/views/settings/CrossSigningPanel-test.tsx
deleted file mode 100644
index 7c1f6b4d1f..0000000000
--- a/test/unit-tests/components/views/settings/CrossSigningPanel-test.tsx
+++ /dev/null
@@ -1,133 +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, screen } from "jest-matrix-react";
-import { type Mocked, mocked } from "jest-mock";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
-
-import CrossSigningPanel from "../../../../../src/components/views/settings/CrossSigningPanel";
-import {
-    flushPromises,
-    getMockClientWithEventEmitter,
-    mockClientMethodsCrypto,
-    mockClientMethodsUser,
-} from "../../../../test-utils";
-import Modal from "../../../../../src/Modal";
-import ConfirmDestroyCrossSigningDialog from "../../../../../src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog";
-
-describe("<CrossSigningPanel />", () => {
-    const userId = "@alice:server.org";
-    let mockClient: Mocked<MatrixClient>;
-    const getComponent = () => render(<CrossSigningPanel />);
-
-    beforeEach(() => {
-        mockClient = getMockClientWithEventEmitter({
-            ...mockClientMethodsUser(userId),
-            ...mockClientMethodsCrypto(),
-            doesServerSupportUnstableFeature: jest.fn(),
-        });
-
-        mockClient.doesServerSupportUnstableFeature.mockResolvedValue(true);
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it("should render a spinner while loading", () => {
-        getComponent();
-
-        expect(screen.getByRole("progressbar")).toBeInTheDocument();
-    });
-
-    it("should render when homeserver does not support cross-signing", async () => {
-        mockClient.doesServerSupportUnstableFeature.mockResolvedValue(false);
-
-        getComponent();
-        await flushPromises();
-
-        expect(screen.getByText("Your homeserver does not support cross-signing.")).toBeInTheDocument();
-    });
-
-    describe("when cross signing is ready", () => {
-        it("should render when keys are not backed up", async () => {
-            getComponent();
-            await flushPromises();
-
-            expect(screen.getByTestId("summarised-status").innerHTML).toEqual(
-                "⚠️ Cross-signing is ready but keys are not backed up.",
-            );
-            expect(screen.getByText("Cross-signing private keys:").parentElement!).toMatchSnapshot();
-        });
-
-        it("should render when keys are backed up", async () => {
-            mocked(mockClient.getCrypto()!.getCrossSigningStatus).mockResolvedValue({
-                publicKeysOnDevice: true,
-                privateKeysInSecretStorage: true,
-                privateKeysCachedLocally: {
-                    masterKey: true,
-                    selfSigningKey: true,
-                    userSigningKey: true,
-                },
-            });
-            getComponent();
-            await flushPromises();
-
-            expect(screen.getByTestId("summarised-status").innerHTML).toEqual("✅ Cross-signing is ready for use.");
-            expect(screen.getByText("Cross-signing private keys:").parentElement!).toMatchSnapshot();
-        });
-
-        it("should allow reset of cross-signing", async () => {
-            mockClient.getCrypto()!.bootstrapCrossSigning = jest.fn().mockResolvedValue(undefined);
-            getComponent();
-            await flushPromises();
-
-            const modalSpy = jest.spyOn(Modal, "createDialog");
-
-            screen.getByRole("button", { name: "Reset" }).click();
-            expect(modalSpy).toHaveBeenCalledWith(ConfirmDestroyCrossSigningDialog, expect.any(Object));
-            modalSpy.mock.lastCall![1]!.onFinished(true);
-            expect(mockClient.getCrypto()!.bootstrapCrossSigning).toHaveBeenCalledWith(
-                expect.objectContaining({ setupNewCrossSigning: true }),
-            );
-        });
-    });
-
-    describe("when cross signing is not ready", () => {
-        beforeEach(() => {
-            mocked(mockClient.getCrypto()!.isCrossSigningReady).mockResolvedValue(false);
-        });
-
-        it("should render when keys are not backed up", async () => {
-            getComponent();
-            await flushPromises();
-
-            expect(screen.getByTestId("summarised-status").innerHTML).toEqual("Cross-signing is not set up.");
-        });
-
-        it("should render when keys are backed up", async () => {
-            mocked(mockClient.getCrypto()!.getCrossSigningStatus).mockResolvedValue({
-                publicKeysOnDevice: true,
-                privateKeysInSecretStorage: true,
-                privateKeysCachedLocally: {
-                    masterKey: true,
-                    selfSigningKey: true,
-                    userSigningKey: true,
-                },
-            });
-            getComponent();
-            await flushPromises();
-
-            expect(screen.getByTestId("summarised-status").innerHTML).toEqual(
-                "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
-            );
-            expect(screen.getByText("Cross-signing private keys:").parentElement!).toMatchSnapshot();
-        });
-    });
-});
diff --git a/test/unit-tests/components/views/settings/CryptographyPanel-test.tsx b/test/unit-tests/components/views/settings/CryptographyPanel-test.tsx
deleted file mode 100644
index 1ee64afe0f..0000000000
--- a/test/unit-tests/components/views/settings/CryptographyPanel-test.tsx
+++ /dev/null
@@ -1,97 +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 React from "react";
-import { render, waitFor, screen, fireEvent } from "jest-matrix-react";
-import { type MatrixClient } from "matrix-js-sdk/src/matrix";
-import { mocked } from "jest-mock";
-
-import { MatrixClientPeg } from "../../../../../src/MatrixClientPeg";
-import * as TestUtils from "../../../../test-utils";
-import CryptographyPanel from "../../../../../src/components/views/settings/CryptographyPanel";
-import { withClientContextRenderOptions } from "../../../../test-utils";
-
-describe("CryptographyPanel", () => {
-    it("shows the session ID and key", async () => {
-        const sessionId = "ABCDEFGHIJ";
-        const sessionKey = "AbCDeFghIJK7L/m4nOPqRSTUVW4xyzaBCDef6gHIJkl";
-        const sessionKeyFormatted = "<strong>AbCD eFgh IJK7 L/m4 nOPq RSTU VW4x yzaB CDef 6gHI Jkl</strong>";
-
-        TestUtils.stubClient();
-        const client: MatrixClient = MatrixClientPeg.safeGet();
-        client.deviceId = sessionId;
-
-        mocked(client.getCrypto()!.getOwnDeviceKeys).mockResolvedValue({ ed25519: sessionKey, curve25519: "1234" });
-
-        // When we render the CryptographyPanel
-        const rendered = render(<CryptographyPanel />, withClientContextRenderOptions(client));
-
-        // Then it displays info about the user's session
-        const codes = rendered.container.querySelectorAll("code");
-        expect(codes.length).toEqual(2);
-        expect(codes[0].innerHTML).toEqual(sessionId);
-
-        // Initially a placeholder
-        expect(codes[1].innerHTML).toEqual("<strong>...</strong>");
-
-        // Then the actual key
-        await waitFor(() => expect(codes[1].innerHTML).toEqual(sessionKeyFormatted));
-    });
-
-    it("handles errors fetching session key", async () => {
-        const sessionId = "ABCDEFGHIJ";
-
-        TestUtils.stubClient();
-        const client: MatrixClient = MatrixClientPeg.safeGet();
-        client.deviceId = sessionId;
-
-        mocked(client.getCrypto()!.getOwnDeviceKeys).mockRejectedValue(new Error("bleh"));
-
-        // When we render the CryptographyPanel
-        const rendered = render(<CryptographyPanel />, withClientContextRenderOptions(client));
-
-        // Then it displays info about the user's session
-        const codes = rendered.container.querySelectorAll("code");
-
-        // Initially a placeholder
-        expect(codes[1].innerHTML).toEqual("<strong>...</strong>");
-
-        // Then "not supported key
-        await waitFor(() => expect(codes[1].innerHTML).toEqual("<strong>&lt;not supported&gt;</strong>"));
-    });
-
-    it("should open the export e2e keys dialog on click", async () => {
-        const sessionId = "ABCDEFGHIJ";
-        const sessionKey = "AbCDeFghIJK7L/m4nOPqRSTUVW4xyzaBCDef6gHIJkl";
-
-        TestUtils.stubClient();
-        const client: MatrixClient = MatrixClientPeg.safeGet();
-        client.deviceId = sessionId;
-
-        mocked(client.getCrypto()!.getOwnDeviceKeys).mockResolvedValue({ ed25519: sessionKey, curve25519: "1234" });
-
-        render(<CryptographyPanel />, withClientContextRenderOptions(client));
-        fireEvent.click(await screen.findByRole("button", { name: "Export E2E room keys" }));
-        await expect(screen.findByRole("heading", { name: "Export room keys" })).resolves.toBeInTheDocument();
-    });
-
-    it("should open the import e2e keys dialog on click", async () => {
-        const sessionId = "ABCDEFGHIJ";
-        const sessionKey = "AbCDeFghIJK7L/m4nOPqRSTUVW4xyzaBCDef6gHIJkl";
-
-        TestUtils.stubClient();
-        const client: MatrixClient = MatrixClientPeg.safeGet();
-        client.deviceId = sessionId;
-
-        mocked(client.getCrypto()!.getOwnDeviceKeys).mockResolvedValue({ ed25519: sessionKey, curve25519: "1234" });
-
-        render(<CryptographyPanel />, withClientContextRenderOptions(client));
-        fireEvent.click(await screen.findByRole("button", { name: "Import E2E room keys" }));
-        await expect(screen.findByRole("heading", { name: "Import room keys" })).resolves.toBeInTheDocument();
-    });
-});
diff --git a/test/unit-tests/components/views/settings/EventIndexPanel-test.tsx b/test/unit-tests/components/views/settings/EventIndexPanel-test.tsx
index 690d9ed2f3..738ff95c76 100644
--- a/test/unit-tests/components/views/settings/EventIndexPanel-test.tsx
+++ b/test/unit-tests/components/views/settings/EventIndexPanel-test.tsx
@@ -8,7 +8,6 @@ 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 { defer, type IDeferred } from "matrix-js-sdk/src/utils";
 
 import EventIndexPanel from "../../../../../src/components/views/settings/EventIndexPanel";
 import EventIndexPeg from "../../../../../src/indexing/EventIndexPeg";
@@ -140,9 +139,9 @@ describe("<EventIndexPanel />", () => {
         });
         it("enables event indexing on enable button click", async () => {
             jest.spyOn(EventIndexPeg, "supportIsInstalled").mockReturnValue(true);
-            let deferredInitEventIndex: IDeferred<boolean> | undefined;
+            let deferredInitEventIndex: PromiseWithResolvers<boolean> | undefined;
             jest.spyOn(EventIndexPeg, "initEventIndex").mockImplementation(() => {
-                deferredInitEventIndex = defer<boolean>();
+                deferredInitEventIndex = Promise.withResolvers<boolean>();
                 return deferredInitEventIndex.promise;
             });
 
diff --git a/test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx b/test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx
index 7fd34159a0..57e5dd39b3 100644
--- a/test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx
+++ b/test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx
@@ -21,7 +21,6 @@ import {
     Visibility,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
-import { defer, type IDeferred } from "matrix-js-sdk/src/utils";
 
 import {
     clearAllModals,
@@ -162,7 +161,7 @@ describe("<JoinRuleSettings />", () => {
             });
 
             it(`upgrades room when changing join rule to ${joinRule}`, async () => {
-                const deferredInvites: IDeferred<any>[] = [];
+                const deferredInvites: PromiseWithResolvers<any>[] = [];
                 // room that doesn't support the join rule
                 const room = new Room(roomId, client, userId);
                 const parentSpace = new Room("!parentSpace:server.org", client, userId);
@@ -185,7 +184,7 @@ describe("<JoinRuleSettings />", () => {
                 // resolve invites by hand
                 // flushPromises is too blunt to test reliably
                 client.invite.mockImplementation(() => {
-                    const p = defer<{}>();
+                    const p = Promise.withResolvers<{}>();
                     deferredInvites.push(p);
                     return p.promise;
                 });
diff --git a/test/unit-tests/components/views/settings/PowerLevelSelector-test.tsx b/test/unit-tests/components/views/settings/PowerLevelSelector-test.tsx
index 7837db5f71..2b9b3e62fa 100644
--- a/test/unit-tests/components/views/settings/PowerLevelSelector-test.tsx
+++ b/test/unit-tests/components/views/settings/PowerLevelSelector-test.tsx
@@ -61,7 +61,12 @@ describe("PowerLevelSelector", () => {
 
     it("should be able to change the power level of the current user", async () => {
         const onClick = jest.fn();
-        renderPLS({ onClick });
+        const userLevels = {
+            [currentUser]: 100,
+            "@alice:server.org": 100,
+            "@bob:server.org": 0,
+        };
+        renderPLS({ userLevels, onClick });
 
         // Until the power level is changed, the apply button should be disabled
         // compound button is using aria-disabled instead of the disabled attribute, we can't toBeDisabled on it
@@ -107,4 +112,58 @@ describe("PowerLevelSelector", () => {
 
         expect(screen.getByText("empty label")).toBeInTheDocument();
     });
+
+    it("should display modal warning if user is last admin", async () => {
+        const onClick = jest.fn();
+
+        renderPLS({ onClick });
+
+        // Until the power level is changed, the apply button should be disabled
+        // compound button is using aria-disabled instead of the disabled attribute, we can't toBeDisabled on it
+        expect(screen.getByRole("button", { name: "Apply" })).toHaveAttribute("aria-disabled", "true");
+
+        const select = screen.getByRole("combobox", { name: currentUser });
+        // Sanity check
+        expect(select).toHaveValue("100");
+
+        // Change current user power level to 50
+        await userEvent.selectOptions(select, "50");
+
+        // modal should appear because only admin in the room
+        expect(screen.findByText("WARNING")).toBeTruthy();
+
+        await userEvent.click(screen.getByRole("button", { name: "Continue" }));
+
+        expect(select).toHaveValue("50");
+        // After the user level changes, the apply button should be enabled
+        expect(screen.getByRole("button", { name: "Apply" })).toHaveAttribute("aria-disabled", "false");
+
+        // Click on Apply should call onClick with the new power level
+        await userEvent.click(screen.getByRole("button", { name: "Apply" }));
+        expect(onClick).toHaveBeenCalledWith(50, currentUser);
+    });
+
+    it("should display modal warning if user is last admin and return to initial value if user cancel", async () => {
+        const onClick = jest.fn();
+
+        renderPLS({ onClick });
+
+        // Until the power level is changed, the apply button should be disabled
+        // compound button is using aria-disabled instead of the disabled attribute, we can't toBeDisabled on it
+        expect(screen.getByRole("button", { name: "Apply" })).toHaveAttribute("aria-disabled", "true");
+
+        const select = screen.getByRole("combobox", { name: currentUser });
+        // Sanity check
+        expect(select).toHaveValue("100");
+
+        // Change current user power level to 50
+        await userEvent.selectOptions(select, "50");
+
+        // modal should appear because only admin in the room
+        expect(screen.findByText("WARNING")).toBeTruthy();
+
+        await userEvent.click(screen.getByRole("button", { name: "Cancel" }));
+        // the power level should be back to initial value
+        expect(select).toHaveValue("100");
+    });
 });
diff --git a/test/unit-tests/components/views/settings/SecureBackupPanel-test.tsx b/test/unit-tests/components/views/settings/SecureBackupPanel-test.tsx
deleted file mode 100644
index 78d59c07f1..0000000000
--- a/test/unit-tests/components/views/settings/SecureBackupPanel-test.tsx
+++ /dev/null
@@ -1,171 +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 { fireEvent, render, screen, within } from "jest-matrix-react";
-import { mocked } from "jest-mock";
-
-import {
-    flushPromises,
-    getMockClientWithEventEmitter,
-    mockClientMethodsCrypto,
-    mockClientMethodsUser,
-} from "../../../../test-utils";
-import SecureBackupPanel from "../../../../../src/components/views/settings/SecureBackupPanel";
-import { accessSecretStorage } from "../../../../../src/SecurityManager";
-
-jest.mock("../../../../../src/SecurityManager", () => ({
-    accessSecretStorage: jest.fn(),
-}));
-
-describe("<SecureBackupPanel />", () => {
-    const userId = "@alice:server.org";
-    const client = getMockClientWithEventEmitter({
-        ...mockClientMethodsUser(userId),
-        ...mockClientMethodsCrypto(),
-        getClientWellKnown: jest.fn(),
-    });
-
-    const getComponent = () => render(<SecureBackupPanel />);
-
-    beforeEach(() => {
-        jest.spyOn(client.getCrypto()!, "getKeyBackupInfo").mockResolvedValue({
-            version: "1",
-            algorithm: "test",
-            auth_data: {
-                public_key: "1234",
-            },
-        });
-        Object.assign(client.getCrypto()!, {
-            isKeyBackupTrusted: jest.fn().mockResolvedValue({
-                trusted: false,
-                matchesDecryptionKey: false,
-            }),
-            getActiveSessionBackupVersion: jest.fn().mockResolvedValue(null),
-            deleteKeyBackupVersion: jest.fn().mockResolvedValue(undefined),
-        });
-
-        mocked(client.secretStorage.hasKey).mockClear().mockResolvedValue(false);
-
-        mocked(accessSecretStorage).mockClear().mockResolvedValue();
-    });
-
-    it("displays a loader while checking keybackup", async () => {
-        getComponent();
-        expect(screen.getByRole("progressbar")).toBeInTheDocument();
-        await flushPromises();
-        expect(screen.queryByRole("progressbar")).not.toBeInTheDocument();
-    });
-
-    it("handles error fetching backup", async () => {
-        // getKeyBackupInfo can fail for various reasons
-        jest.spyOn(client.getCrypto()!, "getKeyBackupInfo").mockImplementation(async () => {
-            throw new Error("beep beep");
-        });
-        const renderResult = getComponent();
-        await renderResult.findByText("Unable to load key backup status");
-        expect(renderResult.container).toMatchSnapshot();
-    });
-
-    it("handles absence of backup", async () => {
-        jest.spyOn(client.getCrypto()!, "getKeyBackupInfo").mockResolvedValue(null);
-        getComponent();
-        // flush getKeyBackupInfo promise
-        await flushPromises();
-        expect(screen.getByText("Back up your keys before signing out to avoid losing them.")).toBeInTheDocument();
-    });
-
-    it("suggests connecting session to key backup when backup exists", async () => {
-        const { container } = getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
-
-        expect(container).toMatchSnapshot();
-    });
-
-    it("displays when session is connected to key backup", async () => {
-        mocked(client.getCrypto()!).getActiveSessionBackupVersion.mockResolvedValue("1");
-        getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
-
-        expect(screen.getByText("✅ This session is backing up your keys.")).toBeInTheDocument();
-    });
-
-    it("asks for confirmation before deleting a backup", async () => {
-        getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
-
-        fireEvent.click(screen.getByText("Delete Backup"));
-
-        const dialog = await screen.findByRole("dialog");
-
-        expect(
-            within(dialog).getByText(
-                "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
-            ),
-        ).toBeInTheDocument();
-
-        fireEvent.click(within(dialog).getByText("Cancel"));
-
-        expect(client.getCrypto()!.deleteKeyBackupVersion).not.toHaveBeenCalled();
-    });
-
-    it("deletes backup after confirmation", async () => {
-        jest.spyOn(client.getCrypto()!, "getKeyBackupInfo")
-            .mockResolvedValueOnce({
-                version: "1",
-                algorithm: "test",
-                auth_data: {
-                    public_key: "1234",
-                },
-            })
-            .mockResolvedValue(null);
-        getComponent();
-
-        fireEvent.click(await screen.findByText("Delete Backup"));
-
-        const dialog = await screen.findByRole("dialog");
-
-        expect(
-            within(dialog).getByText(
-                "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
-            ),
-        ).toBeInTheDocument();
-
-        fireEvent.click(within(dialog).getByTestId("dialog-primary-button"));
-
-        expect(client.getCrypto()!.deleteKeyBackupVersion).toHaveBeenCalledWith("1");
-
-        // delete request
-        await flushPromises();
-        // refresh backup info
-        await flushPromises();
-    });
-
-    it("resets secret storage", async () => {
-        mocked(client.secretStorage.hasKey).mockClear().mockResolvedValue(true);
-        getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
-
-        jest.spyOn(client.getCrypto()!, "getKeyBackupInfo").mockClear();
-        mocked(client.getCrypto()!).isKeyBackupTrusted.mockClear();
-
-        fireEvent.click(screen.getByText("Reset"));
-
-        // enter loading state
-        expect(accessSecretStorage).toHaveBeenCalled();
-        await flushPromises();
-
-        // backup status refreshed
-        expect(client.getCrypto()!.getKeyBackupInfo).toHaveBeenCalled();
-        expect(client.getCrypto()!.isKeyBackupTrusted).toHaveBeenCalled();
-    });
-});
diff --git a/test/unit-tests/components/views/settings/SetIdServer-test.tsx b/test/unit-tests/components/views/settings/SetIdServer-test.tsx
index d92b7c2737..cf8fb45f0d 100644
--- a/test/unit-tests/components/views/settings/SetIdServer-test.tsx
+++ b/test/unit-tests/components/views/settings/SetIdServer-test.tsx
@@ -41,7 +41,7 @@ describe("<SetIdServer />", () => {
     });
 
     it("should allow setting an identity server", async () => {
-        const { getByLabelText, getByRole } = render(getComponent());
+        const { getByLabelText, getByRole, findByRole } = render(getComponent());
 
         fetchMock.get("https://identity.example.org/_matrix/identity/v2", {
             body: {},
@@ -56,14 +56,14 @@ describe("<SetIdServer />", () => {
         const identServerField = getByLabelText("Enter a new identity server");
         await userEvent.type(identServerField, "https://identity.example.org");
         await userEvent.click(getByRole("button", { name: "Change" }));
-        await userEvent.click(getByRole("button", { name: "Continue" }));
+        await userEvent.click(await findByRole("button", { name: "Continue" }));
     });
 
     it("should clear input on cancel", async () => {
-        const { getByLabelText, getByRole } = render(getComponent());
+        const { getByLabelText, findByRole } = render(getComponent());
         const identServerField = getByLabelText("Enter a new identity server");
         await userEvent.type(identServerField, "https://identity.example.org");
-        await userEvent.click(getByRole("button", { name: "Reset" }));
+        await userEvent.click(await findByRole("button", { name: "Reset" }));
         expect((identServerField as HTMLInputElement).value).toEqual("");
     });
 
diff --git a/test/unit-tests/components/views/settings/__snapshots__/CrossSigningPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/CrossSigningPanel-test.tsx.snap
deleted file mode 100644
index d484ba4a3b..0000000000
--- a/test/unit-tests/components/views/settings/__snapshots__/CrossSigningPanel-test.tsx.snap
+++ /dev/null
@@ -1,40 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<CrossSigningPanel /> when cross signing is not ready should render when keys are backed up 1`] = `
-<tr>
-  <th
-    scope="row"
-  >
-    Cross-signing private keys:
-  </th>
-  <td>
-    in secret storage
-  </td>
-</tr>
-`;
-
-exports[`<CrossSigningPanel /> when cross signing is ready should render when keys are backed up 1`] = `
-<tr>
-  <th
-    scope="row"
-  >
-    Cross-signing private keys:
-  </th>
-  <td>
-    in secret storage
-  </td>
-</tr>
-`;
-
-exports[`<CrossSigningPanel /> when cross signing is ready should render when keys are not backed up 1`] = `
-<tr>
-  <th
-    scope="row"
-  >
-    Cross-signing private keys:
-  </th>
-  <td>
-    not found in storage
-  </td>
-</tr>
-`;
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 e8ab3ccd2f..6c99c3fbeb 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
@@ -27,7 +27,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="Modern"
             class="_label_19upo_59"
-            for="radix-:r0:"
+            for="radix-«r0»"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -38,7 +38,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
                 <input
                   checked=""
                   class="_input_1e0uz_18"
-                  id="radix-:r0:"
+                  id="radix-«r0»"
                   name="layout"
                   title=""
                   type="radio"
@@ -154,7 +154,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="Message bubbles"
             class="_label_19upo_59"
-            for="radix-:r9:"
+            for="radix-«r9»"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -164,7 +164,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
               >
                 <input
                   class="_input_1e0uz_18"
-                  id="radix-:r9:"
+                  id="radix-«r9»"
                   name="layout"
                   title=""
                   type="radio"
@@ -280,7 +280,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           <label
             aria-label="IRC (experimental)"
             class="_label_19upo_59"
-            for="radix-:ri:"
+            for="radix-«ri»"
           >
             <div
               class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -290,7 +290,7 @@ exports[`<LayoutSwitcher /> should render 1`] = `
               >
                 <input
                   class="_input_1e0uz_18"
-                  id="radix-:ri:"
+                  id="radix-«ri»"
                   name="layout"
                   title=""
                   type="radio"
@@ -414,9 +414,9 @@ exports[`<LayoutSwitcher /> should render 1`] = `
               class="_container_19o42_10"
             >
               <input
-                aria-describedby="radix-:rs:"
+                aria-describedby="radix-«rs»"
                 class="_input_19o42_24"
-                id="radix-:rr:"
+                id="radix-«rr»"
                 name="compactLayout"
                 title=""
                 type="checkbox"
@@ -431,13 +431,13 @@ exports[`<LayoutSwitcher /> should render 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-:rr:"
+              for="radix-«rr»"
             >
               Show compact text and messages
             </label>
             <span
               class="_message_19upo_85 _help-message_19upo_91"
-              id="radix-:rs:"
+              id="radix-«rs»"
             >
               Modern layout must be selected to use this feature.
             </span>
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 25d06ffc23..ae8a4aa46e 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
@@ -10,22 +10,22 @@ exports[`<Notifications /> main notification switches renders only enable notifi
       class="mx_SettingsFlag_label"
     >
       <div
-        id="mx_LabelledToggleSwitch_testid_0"
+        id="mx_LabelledToggleSwitch_«r0»"
       >
         Enable notifications for this account
       </div>
       <span
         class="mx_Caption"
-        id="mx_LabelledToggleSwitch_testid_0_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_testid_0_caption"
+      aria-describedby="mx_LabelledToggleSwitch_«r0»_caption"
       aria-disabled="false"
-      aria-labelledby="mx_LabelledToggleSwitch_testid_0"
+      aria-labelledby="mx_LabelledToggleSwitch_«r0»"
       class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
       role="switch"
       tabindex="0"
@@ -41,7 +41,7 @@ exports[`<Notifications /> main notification switches renders only enable notifi
     >
       <label
         class="mx_SettingsFlag_label"
-        for="mx_SettingsFlag_testid_1"
+        for="mx_SettingsFlag_testid_0"
       >
         <span
           class="mx_SettingsFlag_labelText"
@@ -54,7 +54,7 @@ exports[`<Notifications /> main notification switches renders only enable notifi
         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_1"
+        id="mx_SettingsFlag_testid_0"
         role="switch"
         tabindex="0"
       >
@@ -68,7 +68,7 @@ exports[`<Notifications /> main notification switches renders only enable notifi
     >
       <label
         class="mx_SettingsFlag_label"
-        for="mx_SettingsFlag_testid_2"
+        for="mx_SettingsFlag_testid_1"
       >
         <span
           class="mx_SettingsFlag_labelText"
@@ -81,7 +81,7 @@ exports[`<Notifications /> main notification switches renders only enable notifi
         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_2"
+        id="mx_SettingsFlag_testid_1"
         role="switch"
         tabindex="0"
       >
diff --git a/test/unit-tests/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
deleted file mode 100644
index 50e253367e..0000000000
--- a/test/unit-tests/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
+++ /dev/null
@@ -1,190 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<SecureBackupPanel /> handles error fetching backup 1`] = `
-<div>
-  <div
-    class="mx_SettingsSubsection_text"
-  >
-    Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.
-  </div>
-  <div
-    class="mx_SettingsSubsection_text"
-  >
-    Unable to load key backup status
-  </div>
-  <details>
-    <summary
-      class="mx_SecureBackupPanel_advanced"
-    >
-      Advanced
-    </summary>
-    <table
-      class="mx_SecureBackupPanel_statusList"
-    >
-      <tr>
-        <th
-          scope="row"
-        >
-          Backup key stored:
-        </th>
-        <td>
-          not stored
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Backup key cached:
-        </th>
-        <td>
-          not found locally
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Secret storage public key:
-        </th>
-        <td>
-          not found
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Secret storage:
-        </th>
-        <td>
-          not ready
-        </td>
-      </tr>
-    </table>
-  </details>
-</div>
-`;
-
-exports[`<SecureBackupPanel /> suggests connecting session to key backup when backup exists 1`] = `
-<div>
-  <div
-    class="mx_SettingsSubsection_text"
-  >
-    Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.
-  </div>
-  <div
-    class="mx_SettingsSubsection_text"
-  >
-    <span>
-      This session is 
-      <strong>
-        not backing up your keys
-      </strong>
-      , but you do have an existing backup you can restore from and add to going forward.
-    </span>
-  </div>
-  <div
-    class="mx_SettingsSubsection_text"
-  >
-    Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.
-  </div>
-  <details>
-    <summary
-      class="mx_SecureBackupPanel_advanced"
-    >
-      Advanced
-    </summary>
-    <table
-      class="mx_SecureBackupPanel_statusList"
-    >
-      <tr>
-        <th
-          scope="row"
-        >
-          Backup key stored:
-        </th>
-        <td>
-          not stored
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Backup key cached:
-        </th>
-        <td>
-          not found locally
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Secret storage public key:
-        </th>
-        <td>
-          not found
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Secret storage:
-        </th>
-        <td>
-          not ready
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Latest backup version on server:
-        </th>
-        <td>
-          1
-           (
-          Algorithm:
-           
-          <code>
-            test
-          </code>
-          )
-        </td>
-      </tr>
-      <tr>
-        <th
-          scope="row"
-        >
-          Active backup version:
-        </th>
-        <td>
-          None
-        </td>
-      </tr>
-    </table>
-    <div />
-  </details>
-  <div
-    class="mx_SecureBackupPanel_buttonRow"
-  >
-    <div
-      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
-      role="button"
-      tabindex="0"
-    >
-      Connect this session to Key Backup
-    </div>
-    <div
-      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger_outline"
-      role="button"
-      tabindex="0"
-    >
-      Delete Backup
-    </div>
-  </div>
-</div>
-`;
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 b030f21f01..3a6dfcd5d6 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
@@ -30,7 +30,7 @@ exports[`<SetIdServer /> renders expected fields 1`] = `
         >
           <label
             class="_label_19upo_59"
-            for="radix-:r0:"
+            for="radix-«r0»"
           >
             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-«r0»"
               name="input"
               placeholder=""
               title=""
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 1f3740f6d7..64b9312ae8 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
@@ -32,7 +32,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             >
               <input
                 class="_input_19o42_24"
-                id="radix-:r28:"
+                id="radix-«r28»"
                 name="systemTheme"
                 title=""
                 type="checkbox"
@@ -47,7 +47,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r28:"
+              for="radix-«r28»"
             >
               Match system theme
             </label>
@@ -69,7 +69,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
               <input
                 checked=""
                 class="_input_1e0uz_18"
-                id="radix-:r29:"
+                id="radix-«r29»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -85,7 +85,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r29:"
+              for="radix-«r29»"
             >
               Light
             </label>
@@ -102,7 +102,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r2a:"
+                id="radix-«r2a»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -118,7 +118,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r2a:"
+              for="radix-«r2a»"
             >
               Dark
             </label>
@@ -135,7 +135,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r2b:"
+                id="radix-«r2b»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -151,7 +151,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r2b:"
+              for="radix-«r2b»"
             >
               High contrast
             </label>
@@ -168,7 +168,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r2c:"
+                id="radix-«r2c»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -184,7 +184,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r2c:"
+              for="radix-«r2c»"
             >
               Alice theme
             </label>
@@ -202,7 +202,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r2d:"
+              for="radix-«r2d»"
             >
               Add custom theme
             </label>
@@ -210,9 +210,9 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
               class="_controls_17lij_8"
             >
               <input
-                aria-describedby="radix-:r2e:"
+                aria-describedby="radix-«r2e»"
                 class="_control_sqdq4_10"
-                id="radix-:r2d:"
+                id="radix-«r2d»"
                 name="input"
                 title=""
                 value=""
@@ -220,7 +220,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-«r2e»"
             >
               Enter the URL of a custom theme you want to apply.
             </span>
@@ -240,7 +240,7 @@ exports[`<ThemeChoicePanel /> custom theme should display custom theme 1`] = `
             </span>
             <button
               aria-label="Delete"
-              aria-labelledby=":r2f:"
+              aria-labelledby="«r2f»"
               class="_icon-button_m2erp_8 _destructive_m2erp_74"
               role="button"
               style="--cpd-icon-button-size: 32px;"
@@ -309,7 +309,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             >
               <input
                 class="_input_19o42_24"
-                id="radix-:r10:"
+                id="radix-«r10»"
                 name="systemTheme"
                 title=""
                 type="checkbox"
@@ -324,7 +324,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r10:"
+              for="radix-«r10»"
             >
               Match system theme
             </label>
@@ -346,7 +346,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
               <input
                 checked=""
                 class="_input_1e0uz_18"
-                id="radix-:r11:"
+                id="radix-«r11»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -362,7 +362,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-«r11»"
             >
               Light
             </label>
@@ -379,7 +379,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r12:"
+                id="radix-«r12»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -395,7 +395,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-«r12»"
             >
               Dark
             </label>
@@ -412,7 +412,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r13:"
+                id="radix-«r13»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -428,7 +428,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-«r13»"
             >
               High contrast
             </label>
@@ -445,7 +445,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r14:"
+                id="radix-«r14»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -461,7 +461,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-«r14»"
             >
               Alice theme
             </label>
@@ -479,7 +479,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r15:"
+              for="radix-«r15»"
             >
               Add custom theme
             </label>
@@ -487,9 +487,9 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
               class="_controls_17lij_8"
             >
               <input
-                aria-describedby="radix-:r16:"
+                aria-describedby="radix-«r16»"
                 class="_control_sqdq4_10"
-                id="radix-:r15:"
+                id="radix-«r15»"
                 name="input"
                 title=""
                 value=""
@@ -497,7 +497,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-«r16»"
             >
               Enter the URL of a custom theme you want to apply.
             </span>
@@ -517,7 +517,7 @@ exports[`<ThemeChoicePanel /> custom theme should render the custom theme sectio
             </span>
             <button
               aria-label="Delete"
-              aria-labelledby=":r17:"
+              aria-labelledby="«r17»"
               class="_icon-button_m2erp_8 _destructive_m2erp_74"
               role="button"
               style="--cpd-icon-button-size: 32px;"
@@ -586,7 +586,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             >
               <input
                 class="_input_19o42_24"
-                id="radix-:r0:"
+                id="radix-«r0»"
                 name="systemTheme"
                 title=""
                 type="checkbox"
@@ -601,7 +601,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59"
-              for="radix-:r0:"
+              for="radix-«r0»"
             >
               Match system theme
             </label>
@@ -623,7 +623,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
               <input
                 checked=""
                 class="_input_1e0uz_18"
-                id="radix-:r1:"
+                id="radix-«r1»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -639,7 +639,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r1:"
+              for="radix-«r1»"
             >
               Light
             </label>
@@ -656,7 +656,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r2:"
+                id="radix-«r2»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -672,7 +672,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r2:"
+              for="radix-«r2»"
             >
               Dark
             </label>
@@ -689,7 +689,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
             >
               <input
                 class="_input_1e0uz_18"
-                id="radix-:r3:"
+                id="radix-«r3»"
                 name="themeSelector"
                 title=""
                 type="radio"
@@ -705,7 +705,7 @@ exports[`<ThemeChoicePanel /> renders the theme choice UI 1`] = `
           >
             <label
               class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-              for="radix-:r3:"
+              for="radix-«r3»"
             >
               High contrast
             </label>
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 d8fa0c9d87..5d99112dd5 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
@@ -23,7 +23,7 @@ exports[`<FilteredDeviceListHeader /> renders correctly when all devices are sel
             >
               <input
                 aria-label="Deselect all"
-                aria-labelledby=":r9:"
+                aria-labelledby="«r9»"
                 checked=""
                 class="_input_1hel1_18"
                 data-testid="device-select-all-checkbox"
@@ -89,7 +89,7 @@ exports[`<FilteredDeviceListHeader /> renders correctly when no devices are sele
             >
               <input
                 aria-label="Select all"
-                aria-labelledby=":r0:"
+                aria-labelledby="«r0»"
                 class="_input_1hel1_18"
                 data-testid="device-select-all-checkbox"
                 id="device-select-all-checkbox"
diff --git a/test/unit-tests/components/views/settings/devices/deleteDevices-test.tsx b/test/unit-tests/components/views/settings/devices/deleteDevices-test.tsx
index 3b030c61c9..603d06d4a6 100644
--- a/test/unit-tests/components/views/settings/devices/deleteDevices-test.tsx
+++ b/test/unit-tests/components/views/settings/devices/deleteDevices-test.tsx
@@ -35,7 +35,7 @@ describe("deleteDevices()", () => {
         await deleteDevicesWithInteractiveAuth(mockClient, deviceIds, onFinished);
 
         expect(mockClient.deleteMultipleDevices).toHaveBeenCalledWith(deviceIds, undefined);
-        expect(onFinished).toHaveBeenCalledWith(true, undefined);
+        expect(onFinished).toHaveBeenCalledWith(true);
 
         // didnt open modal
         expect(modalSpy).not.toHaveBeenCalled();
diff --git a/test/unit-tests/components/views/settings/encryption/DeleteKeyStoragePanel-test.tsx b/test/unit-tests/components/views/settings/encryption/DeleteKeyStoragePanel-test.tsx
index eb9e557025..8daca481ba 100644
--- a/test/unit-tests/components/views/settings/encryption/DeleteKeyStoragePanel-test.tsx
+++ b/test/unit-tests/components/views/settings/encryption/DeleteKeyStoragePanel-test.tsx
@@ -9,7 +9,6 @@ import React from "react";
 import { render, screen, waitFor } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import { createTestClient, withClientContextRenderOptions } from "../../../../../test-utils";
@@ -72,7 +71,7 @@ describe("<DeleteKeyStoragePanel />", () => {
     });
 
     it("should wait with button disabled while setEnabled runs", async () => {
-        const setEnabledDefer = defer();
+        const setEnabledDefer = Promise.withResolvers<void>();
 
         mocked(useKeyStoragePanelViewModel).mockReturnValue({
             setEnabled: jest.fn().mockReturnValue(setEnabledDefer.promise),
diff --git a/test/unit-tests/components/views/settings/encryption/ResetIdentityPanel-test.tsx b/test/unit-tests/components/views/settings/encryption/ResetIdentityPanel-test.tsx
index e331e59824..0275b44142 100644
--- a/test/unit-tests/components/views/settings/encryption/ResetIdentityPanel-test.tsx
+++ b/test/unit-tests/components/views/settings/encryption/ResetIdentityPanel-test.tsx
@@ -7,7 +7,7 @@
 
 import React from "react";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
-import { sleep, defer } from "matrix-js-sdk/src/utils";
+import { sleep } from "matrix-js-sdk/src/utils";
 import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
@@ -24,16 +24,16 @@ describe("<ResetIdentityPanel />", () => {
     it("should reset the encryption when the continue button is clicked", async () => {
         const user = userEvent.setup();
 
-        const onFinish = jest.fn();
+        const onReset = jest.fn();
         const { asFragment } = render(
-            <ResetIdentityPanel variant="compromised" onFinish={onFinish} onCancelClick={jest.fn()} />,
+            <ResetIdentityPanel variant="compromised" onReset={onReset} onCancelClick={jest.fn()} />,
             withClientContextRenderOptions(matrixClient),
         );
         expect(asFragment()).toMatchSnapshot();
 
         // We need to pause the reset so that we can check that it's providing
         // feedback to the user that something is happening.
-        const { promise: resetEncryptionPromise, resolve: resolveResetEncryption } = defer();
+        const { promise: resetEncryptionPromise, resolve: resolveResetEncryption } = Promise.withResolvers<void>();
         jest.spyOn(matrixClient.getCrypto()!, "resetEncryption").mockReturnValue(resetEncryptionPromise);
 
         const continueButton = screen.getByRole("button", { name: "Continue" });
@@ -43,13 +43,22 @@ describe("<ResetIdentityPanel />", () => {
         await sleep(0);
 
         expect(matrixClient.getCrypto()!.resetEncryption).toHaveBeenCalled();
-        expect(onFinish).toHaveBeenCalled();
+        expect(onReset).toHaveBeenCalled();
     });
 
     it("should display the 'forgot recovery key' variant correctly", async () => {
-        const onFinish = jest.fn();
+        const onReset = jest.fn();
         const { asFragment } = render(
-            <ResetIdentityPanel variant="forgot" onFinish={onFinish} onCancelClick={jest.fn()} />,
+            <ResetIdentityPanel variant="forgot" onReset={onReset} onCancelClick={jest.fn()} />,
+            withClientContextRenderOptions(matrixClient),
+        );
+        expect(asFragment()).toMatchSnapshot();
+    });
+
+    it("should display the 'sync failed' variant correctly", async () => {
+        const onReset = jest.fn();
+        const { asFragment } = render(
+            <ResetIdentityPanel variant="sync_failed" onReset={onReset} onCancelClick={jest.fn()} />,
             withClientContextRenderOptions(matrixClient),
         );
         expect(asFragment()).toMatchSnapshot();
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 6ca2b4c4d4..6fc4a56841 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
@@ -219,10 +219,10 @@ exports[`<AdvancedPanel /> <OtherSettings /> should display the blacklist of unv
         class="_container_19o42_10"
       >
         <input
-          aria-describedby="radix-:r7:"
+          aria-describedby="radix-«r7»"
           checked=""
           class="_input_19o42_24"
-          id="radix-:r6:"
+          id="radix-«r6»"
           name="neverSendEncrypted"
           title=""
           type="checkbox"
@@ -237,13 +237,13 @@ exports[`<AdvancedPanel /> <OtherSettings /> should display the blacklist of unv
     >
       <label
         class="_label_19upo_59"
-        for="radix-:r6:"
+        for="radix-«r6»"
       >
         In encrypted rooms, only send messages to verified users
       </label>
       <span
         class="_message_19upo_85 _help-message_19upo_91"
-        id="radix-:r7:"
+        id="radix-«r7»"
       >
         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.
       </span>
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 2ada4e4a3c..c9fa65a64e 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
@@ -253,13 +253,13 @@ exports[`<ChangeRecoveryKey /> flow to set up a recovery key should ask the user
       >
         <label
           class="_label_19upo_59"
-          for="radix-:r0:"
+          for="radix-«r0»"
         >
           Enter recovery key
         </label>
         <input
           class="_control_sqdq4_10"
-          id="radix-:r0:"
+          id="radix-«r0»"
           name="recoveryKey"
           required=""
           title=""
@@ -388,23 +388,23 @@ 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-«r0»"
         >
           Enter recovery key
         </label>
         <input
-          aria-describedby="radix-:r1:"
+          aria-describedby="radix-«r1»"
           aria-invalid="true"
           class="_control_sqdq4_10"
           data-invalid="true"
-          id="radix-:r0:"
+          id="radix-«r0»"
           name="recoveryKey"
           required=""
           title=""
         />
         <span
           class="_message_19upo_85 _error-message_19upo_95"
-          id="radix-:r1:"
+          id="radix-«r1»"
         >
           <svg
             fill="currentColor"
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 1b77adb67b..894abf4842 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
@@ -182,6 +182,188 @@ exports[`<ResetIdentityPanel /> should display the 'forgot recovery key' variant
 </DocumentFragment>
 `;
 
+exports[`<ResetIdentityPanel /> should display the 'sync failed' variant correctly 1`] = `
+<DocumentFragment>
+  <nav
+    class="_breadcrumb_1xygz_8"
+  >
+    <button
+      aria-label="Back"
+      class="_icon-button_m2erp_8 _subtle-bg_m2erp_29"
+      role="button"
+      style="--cpd-icon-button-size: 28px;"
+      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="m13.3 17.3-4.6-4.6a.9.9 0 0 1-.213-.325A1.1 1.1 0 0 1 8.425 12q0-.2.062-.375A.9.9 0 0 1 8.7 11.3l4.6-4.6a.95.95 0 0 1 .7-.275q.425 0 .7.275a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7L10.8 12l3.9 3.9a.95.95 0 0 1 .275.7.95.95 0 0 1-.275.7.95.95 0 0 1-.7.275.95.95 0 0 1-.7-.275"
+          />
+        </svg>
+      </div>
+    </button>
+    <ol
+      class="_pages_1xygz_17"
+    >
+      <li>
+        <a
+          class="_link_1v5rz_8"
+          data-kind="primary"
+          data-size="small"
+          rel="noreferrer noopener"
+          role="button"
+          tabindex="0"
+        >
+          Encryption
+        </a>
+      </li>
+      <li>
+        <span
+          aria-current="page"
+          class="_last-page_1xygz_30"
+        >
+          Reset encryption
+        </span>
+      </li>
+    </ol>
+  </nav>
+  <div
+    class="mx_EncryptionCard"
+  >
+    <div
+      class="mx_EncryptionCard_header"
+    >
+      <div
+        class="_content_o77nw_8 _destructive_o77nw_34"
+        data-size="large"
+      >
+        <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 22"
+          />
+        </svg>
+      </div>
+      <h2
+        class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
+      >
+        Failed to sync key storage. You need to reset your identity.
+      </h2>
+    </div>
+    <div
+      class="mx_Flex 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"
+      >
+        <li
+          class="_visual-list-item_1ma3e_8"
+        >
+          <svg
+            aria-hidden="true"
+            class="_visual-list-item-icon_1ma3e_17 _visual-list-item-icon-success_1ma3e_22"
+            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>
+          Your account details, contacts, preferences, and chat list will be kept
+        </li>
+        <li
+          class="_visual-list-item_1ma3e_8"
+        >
+          <svg
+            aria-hidden="true"
+            class="_visual-list-item-icon_1ma3e_17"
+            fill="currentColor"
+            height="24px"
+            viewBox="0 0 24 24"
+            width="24px"
+            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>
+          You will lose any message history that’s stored only on the server
+        </li>
+        <li
+          class="_visual-list-item_1ma3e_8"
+        >
+          <svg
+            aria-hidden="true"
+            class="_visual-list-item-icon_1ma3e_17"
+            fill="currentColor"
+            height="24px"
+            viewBox="0 0 24 24"
+            width="24px"
+            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>
+          You will need to verify all your existing devices and contacts again
+        </li>
+      </ul>
+    </div>
+    <div
+      class="mx_EncryptionCard_buttons"
+    >
+      <button
+        aria-disabled="false"
+        class="_button_vczzf_8 _destructive_vczzf_107"
+        data-kind="primary"
+        data-size="lg"
+        role="button"
+        tabindex="0"
+      >
+        Continue
+      </button>
+      <button
+        class="_button_vczzf_8"
+        data-kind="tertiary"
+        data-size="lg"
+        role="button"
+        tabindex="0"
+      >
+        Cancel
+      </button>
+    </div>
+  </div>
+</DocumentFragment>
+`;
+
 exports[`<ResetIdentityPanel /> should reset the encryption when the continue button is clicked 1`] = `
 <DocumentFragment>
   <nav
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 6ce079e9d2..6ec9599fe1 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
@@ -21,7 +21,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+                id="mx_LabelledToggleSwitch_«r17»"
               >
                 Enable notifications for this account
               </div>
@@ -29,7 +29,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             <div
               aria-checked="true"
               aria-disabled="true"
-              aria-labelledby="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+              aria-labelledby="mx_LabelledToggleSwitch_«r17»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
               role="switch"
               tabindex="0"
@@ -46,7 +46,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_QgU2PomxwKpa"
+                id="mx_LabelledToggleSwitch_«r18»"
               >
                 Enable desktop notifications for this session
               </div>
@@ -54,7 +54,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             <div
               aria-checked="false"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_QgU2PomxwKpa"
+              aria-labelledby="mx_LabelledToggleSwitch_«r18»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -71,7 +71,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_6hpi3YEetmBG"
+                id="mx_LabelledToggleSwitch_«r19»"
               >
                 Show message preview in desktop notification
               </div>
@@ -79,7 +79,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             <div
               aria-checked="false"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_6hpi3YEetmBG"
+              aria-labelledby="mx_LabelledToggleSwitch_«r19»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -96,7 +96,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_4yVCeEefiPqp"
+                id="mx_LabelledToggleSwitch_«r1a»"
               >
                 Enable audible notifications for this session
               </div>
@@ -104,7 +104,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             <div
               aria-checked="true"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_4yVCeEefiPqp"
+              aria-labelledby="mx_LabelledToggleSwitch_«r1a»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -251,7 +251,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_MRMwbPDmfG"
+                        id="checkbox_vY7Q4uEh9K"
                         type="checkbox"
                       />
                       <div
@@ -277,7 +277,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_MRMwbPDmfG"
+                      for="checkbox_vY7Q4uEh9K"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -308,7 +308,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_tmGQvdMWe9"
+                        id="checkbox_38QgU2Pomx"
                         type="checkbox"
                       />
                       <div
@@ -334,7 +334,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_tmGQvdMWe9"
+                      for="checkbox_38QgU2Pomx"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -365,7 +365,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_54DVIAu5Cs"
+                        id="checkbox_wKpa6hpi3Y"
                         type="checkbox"
                       />
                       <div
@@ -391,7 +391,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_54DVIAu5Cs"
+                      for="checkbox_wKpa6hpi3Y"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -439,7 +439,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_iHRD7nyrA2"
+                        id="checkbox_EetmBG4yVC"
                         type="checkbox"
                       />
                       <div
@@ -465,7 +465,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_iHRD7nyrA2"
+                      for="checkbox_EetmBG4yVC"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -495,7 +495,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                       <input
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_ohjWVJIPau"
+                        id="checkbox_eEefiPqpMR"
                         type="checkbox"
                       />
                       <div
@@ -521,7 +521,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_ohjWVJIPau"
+                      for="checkbox_eEefiPqpMR"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -552,7 +552,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_y1OmnTidX4"
+                        id="checkbox_MwbPDmfGtm"
                         type="checkbox"
                       />
                       <div
@@ -578,7 +578,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_y1OmnTidX4"
+                      for="checkbox_MwbPDmfGtm"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -647,7 +647,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_ePDS0OpWwA"
+                        id="checkbox_GQvdMWe954"
                         type="checkbox"
                       />
                       <div
@@ -673,7 +673,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_ePDS0OpWwA"
+                      for="checkbox_GQvdMWe954"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -704,7 +704,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_HG75JNTNkN"
+                        id="checkbox_DVIAu5CsiH"
                         type="checkbox"
                       />
                       <div
@@ -730,7 +730,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_HG75JNTNkN"
+                      for="checkbox_DVIAu5CsiH"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -758,11 +758,11 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r1s:"
+                        aria-describedby="«r24»"
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
-                        id="checkbox_U64raTLcRs"
+                        id="checkbox_RD7nyrA2oh"
                         type="checkbox"
                       />
                       <div
@@ -788,7 +788,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_U64raTLcRs"
+                      for="checkbox_RD7nyrA2oh"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -798,7 +798,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r1s:"
+                      id="«r24»"
                     >
                       Enter keywords here, or use for spelling variations or nicknames
                     </span>
@@ -850,7 +850,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             >
               <label
                 class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_QRlYy75nfv5b"
+                for="mx_SettingsFlag_jWVJIPauy1Om"
               >
                 <span
                   class="mx_SettingsFlag_labelText"
@@ -863,7 +863,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                 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_QRlYy75nfv5b"
+                id="mx_SettingsFlag_jWVJIPauy1Om"
                 role="switch"
                 tabindex="0"
               >
@@ -877,7 +877,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
             >
               <label
                 class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_OEPN1su1JYVt"
+                for="mx_SettingsFlag_nTidX4ePDS0O"
               >
                 <span
                   class="mx_SettingsFlag_labelText"
@@ -890,7 +890,7 @@ exports[`<Notifications /> correctly handles the loading/disabled state 1`] = `
                 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_OEPN1su1JYVt"
+                id="mx_SettingsFlag_nTidX4ePDS0O"
                 role="switch"
                 tabindex="0"
               >
@@ -998,7 +998,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+                id="mx_LabelledToggleSwitch_«r0»"
               >
                 Enable notifications for this account
               </div>
@@ -1006,7 +1006,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             <div
               aria-checked="true"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_vY7Q4uEh9K38"
+              aria-labelledby="mx_LabelledToggleSwitch_«r0»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -1023,7 +1023,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_QgU2PomxwKpa"
+                id="mx_LabelledToggleSwitch_«r1»"
               >
                 Enable desktop notifications for this session
               </div>
@@ -1031,7 +1031,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             <div
               aria-checked="false"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_QgU2PomxwKpa"
+              aria-labelledby="mx_LabelledToggleSwitch_«r1»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -1048,7 +1048,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_6hpi3YEetmBG"
+                id="mx_LabelledToggleSwitch_«r2»"
               >
                 Show message preview in desktop notification
               </div>
@@ -1056,7 +1056,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             <div
               aria-checked="false"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_6hpi3YEetmBG"
+              aria-labelledby="mx_LabelledToggleSwitch_«r2»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -1073,7 +1073,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
               class="mx_SettingsFlag_label"
             >
               <div
-                id="mx_LabelledToggleSwitch_4yVCeEefiPqp"
+                id="mx_LabelledToggleSwitch_«r3»"
               >
                 Enable audible notifications for this session
               </div>
@@ -1081,7 +1081,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             <div
               aria-checked="true"
               aria-disabled="false"
-              aria-labelledby="mx_LabelledToggleSwitch_4yVCeEefiPqp"
+              aria-labelledby="mx_LabelledToggleSwitch_«r3»"
               class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
               role="switch"
               tabindex="0"
@@ -1224,7 +1224,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_OyR5kbu3pE"
+                        id="checkbox_pWwAHG75JN"
                         type="checkbox"
                       />
                       <div
@@ -1250,7 +1250,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_OyR5kbu3pE"
+                      for="checkbox_pWwAHG75JN"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1280,7 +1280,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_wuLn9EnnYu"
+                        id="checkbox_TNkNU64raT"
                         type="checkbox"
                       />
                       <div
@@ -1306,7 +1306,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_wuLn9EnnYu"
+                      for="checkbox_TNkNU64raT"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1336,7 +1336,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_xfFEpOsztW"
+                        id="checkbox_LcRsQRlYy7"
                         type="checkbox"
                       />
                       <div
@@ -1362,7 +1362,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_xfFEpOsztW"
+                      for="checkbox_LcRsQRlYy7"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1409,7 +1409,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_hQkBerF1ej"
+                        id="checkbox_5nfv5bOEPN"
                         type="checkbox"
                       />
                       <div
@@ -1435,7 +1435,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_hQkBerF1ej"
+                      for="checkbox_5nfv5bOEPN"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1464,7 +1464,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                     >
                       <input
                         class="_input_1hel1_18"
-                        id="checkbox_c4GFes1UFz"
+                        id="checkbox_1su1JYVtOy"
                         type="checkbox"
                       />
                       <div
@@ -1490,7 +1490,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_c4GFes1UFz"
+                      for="checkbox_1su1JYVtOy"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1520,7 +1520,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_OK2nvfGFMl"
+                        id="checkbox_R5kbu3pEwu"
                         type="checkbox"
                       />
                       <div
@@ -1546,7 +1546,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_OK2nvfGFMl"
+                      for="checkbox_R5kbu3pEwu"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1614,7 +1614,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_dL2r2vbsSw"
+                        id="checkbox_Ln9EnnYuxf"
                         type="checkbox"
                       />
                       <div
@@ -1640,7 +1640,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_dL2r2vbsSw"
+                      for="checkbox_Ln9EnnYuxf"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1670,7 +1670,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       <input
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_icmKUiOBdv"
+                        id="checkbox_FEpOsztWhQ"
                         type="checkbox"
                       />
                       <div
@@ -1696,7 +1696,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_icmKUiOBdv"
+                      for="checkbox_FEpOsztWhQ"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1724,10 +1724,10 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rp:"
+                        aria-describedby="«rt»"
                         checked=""
                         class="_input_1hel1_18"
-                        id="checkbox_qsxEaZtl3A"
+                        id="checkbox_kBerF1ejc4"
                         type="checkbox"
                       />
                       <div
@@ -1753,7 +1753,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="checkbox_qsxEaZtl3A"
+                      for="checkbox_kBerF1ejc4"
                     >
                       <span
                         class="mx_LabelledCheckbox_label"
@@ -1763,7 +1763,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rp:"
+                      id="«rt»"
                     >
                       Enter keywords here, or use for spelling variations or nicknames
                     </span>
@@ -2029,7 +2029,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             >
               <label
                 class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_QRlYy75nfv5b"
+                for="mx_SettingsFlag_jWVJIPauy1Om"
               >
                 <span
                   class="mx_SettingsFlag_labelText"
@@ -2042,7 +2042,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                 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_QRlYy75nfv5b"
+                id="mx_SettingsFlag_jWVJIPauy1Om"
                 role="switch"
                 tabindex="0"
               >
@@ -2056,7 +2056,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
             >
               <label
                 class="mx_SettingsFlag_label"
-                for="mx_SettingsFlag_OEPN1su1JYVt"
+                for="mx_SettingsFlag_nTidX4ePDS0O"
               >
                 <span
                   class="mx_SettingsFlag_labelText"
@@ -2069,7 +2069,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                 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_OEPN1su1JYVt"
+                id="mx_SettingsFlag_nTidX4ePDS0O"
                 role="switch"
                 tabindex="0"
               >
@@ -2139,7 +2139,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                       >
                         <input
                           class="_input_1hel1_18"
-                          id="checkbox_NIiWzqsApP"
+                          id="checkbox_GFes1UFzOK"
                           type="checkbox"
                         />
                         <div
@@ -2165,7 +2165,7 @@ exports[`<Notifications /> matches the snapshot 1`] = `
                     >
                       <label
                         class="_label_19upo_59"
-                        for="checkbox_NIiWzqsApP"
+                        for="checkbox_GFes1UFzOK"
                       >
                         <span
                           class="mx_LabelledCheckbox_label"
diff --git a/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
index 54d8bd7ac0..f4efc39e1f 100644
--- a/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/room/NotificationSettingsTab-test.tsx
@@ -37,6 +37,10 @@ describe("NotificatinSettingsTab", () => {
         NotificationSettingsTab.contextType = React.createContext<MatrixClient>(cli);
     });
 
+    afterEach(() => {
+        SettingsStore.reset();
+    });
+
     it("should prevent »Settings« link click from bubbling up to radio buttons", async () => {
         const tab = renderTab();
 
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 9dc5860119..afd84ab33a 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
@@ -18,7 +18,6 @@ import {
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked } from "jest-mock";
-import { defer } from "matrix-js-sdk/src/utils";
 import userEvent from "@testing-library/user-event";
 
 import RolesRoomSettingsTab from "../../../../../../../src/components/views/settings/tabs/room/RolesRoomSettingsTab";
@@ -209,7 +208,7 @@ describe("RolesRoomSettingsTab", () => {
     });
 
     it("should roll back power level change on error", async () => {
-        const deferred = defer<ISendEventResponse>();
+        const deferred = Promise.withResolvers<ISendEventResponse>();
         mocked(cli.sendStateEvent).mockReturnValue(deferred.promise);
         mocked(cli.getRoom).mockReturnValue(room);
         // @ts-ignore - mocked doesn't support overloads properly
@@ -224,6 +223,9 @@ describe("RolesRoomSettingsTab", () => {
                     content: {
                         users: {
                             [cli.getUserId()!]: 100,
+                            // needs at least one remaning admin in the room if we want to demote our user
+                            // otherwise another modal will be displayed
+                            ["@admin:server"]: 100,
                         },
                     },
                 });
diff --git a/test/unit-tests/components/views/settings/tabs/user/AccountUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/AccountUserSettingsTab-test.tsx
index f6b6b2e850..b12ba3a4ab 100644
--- a/test/unit-tests/components/views/settings/tabs/user/AccountUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/AccountUserSettingsTab-test.tsx
@@ -153,7 +153,8 @@ describe("<AccountUserSettingsTab />", () => {
                 (settingName) => settingName === UIFeature.Deactivate,
             );
 
-            const createDialogFn = jest.fn();
+            const finishedDeferred = Promise.withResolvers<[boolean]>();
+            const createDialogFn = jest.fn().mockReturnValue({ finished: finishedDeferred.promise });
             jest.spyOn(Modal, "createDialog").mockImplementation(createDialogFn);
 
             render(getComponent());
@@ -167,14 +168,16 @@ describe("<AccountUserSettingsTab />", () => {
                 (settingName) => settingName === UIFeature.Deactivate,
             );
 
-            const createDialogFn = jest.fn();
+            const finishedDeferred = Promise.withResolvers<[boolean]>();
+            const createDialogFn = jest.fn().mockReturnValue({ finished: finishedDeferred.promise });
             jest.spyOn(Modal, "createDialog").mockImplementation(createDialogFn);
 
             render(getComponent());
 
             await userEvent.click(screen.getByRole("button", { name: "Deactivate Account" }));
 
-            createDialogFn.mock.calls[0][1].onFinished(true);
+            finishedDeferred.resolve([true]);
+            await flushPromises();
 
             expect(defaultProps.closeSettingsFn).toHaveBeenCalled();
         });
@@ -183,14 +186,16 @@ describe("<AccountUserSettingsTab />", () => {
                 (settingName) => settingName === UIFeature.Deactivate,
             );
 
-            const createDialogFn = jest.fn();
+            const finishedDeferred = Promise.withResolvers<[boolean]>();
+            const createDialogFn = jest.fn().mockReturnValue({ finished: finishedDeferred.promise });
             jest.spyOn(Modal, "createDialog").mockImplementation(createDialogFn);
 
             render(getComponent());
 
             await userEvent.click(screen.getByRole("button", { name: "Deactivate Account" }));
 
-            createDialogFn.mock.calls[0][1].onFinished(false);
+            finishedDeferred.resolve([false]);
+            await flushPromises();
 
             expect(defaultProps.closeSettingsFn).not.toHaveBeenCalled();
         });
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 04b34573ac..018ec25ef3 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
@@ -62,7 +62,7 @@ describe("<EncryptionUserSettingsTab />", () => {
         );
         expect(asFragment()).toMatchSnapshot();
 
-        const spy = jest.spyOn(Modal, "createDialog").mockReturnValue({} as any);
+        const spy = jest.spyOn(Modal, "createDialog").mockReturnValue({ finished: new Promise(() => {}) } as any);
         await user.click(screen.getByText("Verify this device"));
         expect(spy).toHaveBeenCalled();
     });
@@ -151,18 +151,30 @@ describe("<EncryptionUserSettingsTab />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
-    it("should enter reset flow when showResetIdentity is set", async () => {
+    it("should enter 'Forgot recovery' flow when initialState is set to 'reset_identity_forgot'", async () => {
         jest.spyOn(matrixClient.getCrypto()!, "getActiveSessionBackupVersion").mockResolvedValue("1");
 
         renderComponent({ initialState: "reset_identity_forgot" });
 
-        await expect(
+        expect(
             await screen.findByRole("heading", {
                 name: "Forgot your recovery key? You’ll need to reset your identity.",
             }),
         ).toBeVisible();
     });
 
+    it("should do 'Failed to sync' reset flow when initialState is set to 'reset_identity_sync_failed'", async () => {
+        jest.spyOn(matrixClient.getCrypto()!, "getActiveSessionBackupVersion").mockResolvedValue("1");
+
+        renderComponent({ initialState: "reset_identity_sync_failed" });
+
+        expect(
+            await screen.findByRole("heading", {
+                name: "Failed to sync key storage. You need to reset your identity.",
+            }),
+        ).toBeVisible();
+    });
+
     it("should update when key backup status event is fired", async () => {
         jest.spyOn(matrixClient.getCrypto()!, "getActiveSessionBackupVersion").mockResolvedValue("1");
 
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..2753bd39c9
--- /dev/null
+++ b/test/unit-tests/components/views/settings/tabs/user/InviteRulesAccountSetting-test.tsx
@@ -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.
+*/
+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(mediaPreviews: ComputedInviteConfig, supported = true) {
+    jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => {
+        if (settingName === "inviteRules") {
+            return mediaPreviews;
+        }
+        throw Error(`Unexpected setting ${settingName}`);
+    });
+    jest.spyOn(SettingsStore, "disabledMessage").mockImplementation((settingName) => {
+        if (settingName === "inviteRules") {
+            return supported ? undefined : "test-not-supported";
+        }
+        throw Error(`Unexpected setting ${settingName}`);
+    });
+}
+
+describe("InviteRulesAccountSetting", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("does not render if not supported", async () => {
+        mockSetting({ allBlocked: 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();
+    });
+    it("renders correct state when invites are not blocked", async () => {
+        mockSetting({ allBlocked: false }, true);
+        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 }, 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 }, 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);
+        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);
+        expect(SettingsStore.setValue).toHaveBeenCalledWith("inviteRules", null, SettingLevel.ACCOUNT, {
+            allBlocked: false,
+        });
+    });
+});
diff --git a/test/unit-tests/components/views/settings/tabs/user/MediaPreviewAccountSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/MediaPreviewAccountSettingsTab-test.tsx
new file mode 100644
index 0000000000..e5946c070d
--- /dev/null
+++ b/test/unit-tests/components/views/settings/tabs/user/MediaPreviewAccountSettingsTab-test.tsx
@@ -0,0 +1,99 @@
+/*
+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 userEvent from "@testing-library/user-event";
+import { type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
+
+import { MediaPreviewAccountSettings } from "../../../../../../../src/components/views/settings/tabs/user/MediaPreviewAccountSettings";
+import {
+    getMockClientWithEventEmitter,
+    mockClientMethodsServer,
+    mockClientMethodsUser,
+} from "../../../../../../test-utils";
+import MatrixClientBackedController from "../../../../../../../src/settings/controllers/MatrixClientBackedController";
+import MatrixClientBackedSettingsHandler from "../../../../../../../src/settings/handlers/MatrixClientBackedSettingsHandler";
+import type { MockedObject } from "jest-mock";
+import {
+    MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+    type MediaPreviewConfig,
+    MediaPreviewValue,
+} from "../../../../../../../src/@types/media_preview";
+import MediaPreviewConfigController from "../../../../../../../src/settings/controllers/MediaPreviewConfigController";
+
+describe("MediaPreviewAccountSettings", () => {
+    let client: MockedObject<MatrixClient>;
+    beforeEach(() => {
+        client = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            ...mockClientMethodsUser(),
+            getRoom: jest.fn(),
+            setAccountData: jest.fn(),
+            isVersionSupported: jest.fn().mockResolvedValue(true),
+        });
+        MatrixClientBackedController.matrixClient = client;
+        MatrixClientBackedSettingsHandler.matrixClient = client;
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("should render", () => {
+        const { getByLabelText } = render(<MediaPreviewAccountSettings />);
+        // Defaults
+        expect(getByLabelText("Hide avatars of room and inviter")).not.toBeChecked();
+        expect(getByLabelText("Always hide")).not.toBeChecked();
+        expect(getByLabelText("In private rooms")).not.toBeChecked();
+        expect(getByLabelText("Always show")).toBeChecked();
+    });
+
+    it("should be able to toggle hide avatar", async () => {
+        const { getByLabelText } = render(<MediaPreviewAccountSettings />);
+        // Defaults
+        const element = getByLabelText("Hide avatars of room and inviter");
+        await userEvent.click(element);
+        expect(client.setAccountData).toHaveBeenCalledWith(MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, {
+            invite_avatars: MediaPreviewValue.Off,
+            media_previews: MediaPreviewValue.On,
+        });
+        // Ensure we don't double set the account data.
+        expect(client.setAccountData).toHaveBeenCalledTimes(1);
+    });
+
+    // Skip the default.
+    it.each([
+        ["Always hide", MediaPreviewValue.Off],
+        ["In private rooms", MediaPreviewValue.Private],
+        ["Always show", MediaPreviewValue.On],
+    ])("should be able to toggle media preview option %s", async (key, value) => {
+        if (value === MediaPreviewConfigController.default.media_previews) {
+            // This is the default, so switch away first.
+            client.getAccountData.mockImplementation((type) => {
+                if (type === MEDIA_PREVIEW_ACCOUNT_DATA_TYPE) {
+                    return new MatrixEvent({
+                        content: {
+                            media_previews: MediaPreviewValue.Off,
+                        } satisfies Partial<MediaPreviewConfig>,
+                    });
+                }
+                return undefined;
+            });
+        }
+        const { getByLabelText } = render(<MediaPreviewAccountSettings />);
+
+        const element = getByLabelText(key);
+        await userEvent.click(element);
+        expect(client.setAccountData).toHaveBeenCalledWith(MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, {
+            invite_avatars: MediaPreviewValue.On,
+            media_previews: value,
+        });
+        // Ensure we don't double set the account data.
+        expect(client.setAccountData).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/test/unit-tests/components/views/settings/tabs/user/SecurityUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/SecurityUserSettingsTab-test.tsx
index 65c1bf1d48..454be8adaa 100644
--- a/test/unit-tests/components/views/settings/tabs/user/SecurityUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/SecurityUserSettingsTab-test.tsx
@@ -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 { render } from "jest-matrix-react";
-import React from "react";
+import React, { act } from "react";
+import userEvent from "@testing-library/user-event";
 
 import SecurityUserSettingsTab from "../../../../../../../src/components/views/settings/tabs/user/SecurityUserSettingsTab";
 import MatrixClientContext from "../../../../../../../src/contexts/MatrixClientContext";
@@ -19,12 +20,16 @@ import {
     mockPlatformPeg,
 } from "../../../../../../test-utils";
 import { SDKContext, SdkContextClass } from "../../../../../../../src/contexts/SDKContext";
+import defaultDispatcher from "../../../../../../../src/dispatcher/dispatcher";
 
 describe("<SecurityUserSettingsTab />", () => {
     const defaultProps = {
         closeSettingsFn: jest.fn(),
     };
 
+    const getIgnoredUsers = jest.fn();
+    const setIgnoredUsers = jest.fn();
+
     const userId = "@alice:server.org";
     const deviceId = "alices-device";
     const mockClient = getMockClientWithEventEmitter({
@@ -33,7 +38,9 @@ describe("<SecurityUserSettingsTab />", () => {
         ...mockClientMethodsDevice(deviceId),
         ...mockClientMethodsCrypto(),
         getRooms: jest.fn().mockReturnValue([]),
-        getIgnoredUsers: jest.fn(),
+        getPushers: jest.fn().mockReturnValue([]),
+        getIgnoredUsers,
+        setIgnoredUsers,
     });
 
     const sdkContext = new SdkContextClass();
@@ -57,4 +64,29 @@ describe("<SecurityUserSettingsTab />", () => {
 
         expect(container).toMatchSnapshot();
     });
+
+    it("renders ignored users", () => {
+        getIgnoredUsers.mockReturnValue(["@bob:example.org"]);
+        const { getByRole } = render(getComponent());
+        const ignoredUsers = getByRole("list", { name: "Ignored users" });
+
+        expect(ignoredUsers).toMatchSnapshot();
+    });
+
+    it("allows unignoring a user", async () => {
+        getIgnoredUsers.mockReturnValue(["@bob:example.org"]);
+        const { getByText, getByRole } = render(getComponent());
+        await userEvent.click(getByRole("button", { name: "Unignore" }));
+        expect(setIgnoredUsers).toHaveBeenCalledWith([]);
+        await act(() => {
+            getIgnoredUsers.mockReturnValue([]);
+            defaultDispatcher.dispatch(
+                {
+                    action: "ignore_state_changed",
+                },
+                true,
+            );
+        });
+        expect(getByText("You have no ignored users.")).toBeVisible();
+    });
 });
diff --git a/test/unit-tests/components/views/settings/tabs/user/SessionManagerTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/SessionManagerTab-test.tsx
index 171fa4b827..709d4e1714 100644
--- a/test/unit-tests/components/views/settings/tabs/user/SessionManagerTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/SessionManagerTab-test.tsx
@@ -19,7 +19,7 @@ import {
 } from "jest-matrix-react";
 import { logger } from "matrix-js-sdk/src/logger";
 import { type CryptoApi, DeviceVerificationStatus, type VerificationRequest } from "matrix-js-sdk/src/crypto-api";
-import { defer, sleep } from "matrix-js-sdk/src/utils";
+import { sleep } from "matrix-js-sdk/src/utils";
 import {
     ClientEvent,
     Device,
@@ -41,6 +41,7 @@ import {
     flushPromises,
     getMockClientWithEventEmitter,
     mkPusher,
+    mockClientMethodsCrypto,
     mockClientMethodsServer,
     mockClientMethodsUser,
     mockPlatformPeg,
@@ -124,10 +125,11 @@ describe("<SessionManagerTab />", () => {
 
     const mockCrypto = mocked({
         getDeviceVerificationStatus: jest.fn(),
-        getUserDeviceInfo: jest.fn(),
+        getUserDeviceInfo: jest.fn().mockResolvedValue(new Map()),
         requestDeviceVerification: jest.fn().mockResolvedValue(mockVerificationRequest),
         supportsSecretsForQrLogin: jest.fn().mockReturnValue(false),
         isCrossSigningReady: jest.fn().mockReturnValue(true),
+        getVerificationRequestsToDeviceInProgress: jest.fn().mockReturnValue([]),
     } as unknown as CryptoApi);
 
     let mockClient!: MockedObject<MatrixClient>;
@@ -203,6 +205,7 @@ describe("<SessionManagerTab />", () => {
         mockClient = getMockClientWithEventEmitter({
             ...mockClientMethodsUser(aliceId),
             ...mockClientMethodsServer(),
+            ...mockClientMethodsCrypto(),
             getCrypto: jest.fn().mockReturnValue(mockCrypto),
             getDevices: jest.fn(),
             getDeviceId: jest.fn().mockReturnValue(deviceId),
@@ -628,9 +631,10 @@ describe("<SessionManagerTab />", () => {
             // click verify button from current session section
             fireEvent.click(getByTestId(`verification-status-button-${alicesMobileDevice.device_id}`));
 
-            const { onFinished: modalOnFinished } = modalSpy.mock.calls[0][1] as any;
-            // simulate modal completing process
-            await modalOnFinished();
+            // close the modal
+            const { close: closeModal } = modalSpy.mock.results[0].value;
+            closeModal();
+            await flushPromises();
 
             // cancelled in case it was a failure exit from modal
             expect(mockVerificationRequest.cancel).toHaveBeenCalled();
@@ -895,7 +899,7 @@ describe("<SessionManagerTab />", () => {
             });
 
             it("deletes a device when interactive auth is not required", async () => {
-                const deferredDeleteMultipleDevices = defer<{}>();
+                const deferredDeleteMultipleDevices = Promise.withResolvers<{}>();
                 mockClient.deleteMultipleDevices.mockReturnValue(deferredDeleteMultipleDevices.promise);
                 mockClient.getDevices.mockResolvedValue({
                     devices: [alicesDevice, alicesMobileDevice, alicesOlderMobileDevice],
@@ -1104,7 +1108,7 @@ describe("<SessionManagerTab />", () => {
                 // get a handle for resolving the delete call
                 // because promise flushing after the confirm modal is resolving this too
                 // and we want to test the loading state here
-                const resolveDeleteRequest = defer<IAuthData>();
+                const resolveDeleteRequest = Promise.withResolvers<IAuthData>();
                 mockClient.deleteMultipleDevices.mockImplementation(async () => {
                     await resolveDeleteRequest.promise;
                     return {};
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 82e33ef47b..6c0407a9e8 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
@@ -46,7 +46,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       <input
                         class="_input_1e0uz_18"
                         disabled=""
-                        id="radix-:r0:"
+                        id="radix-«r0»"
                         name="themeSelector"
                         title=""
                         type="radio"
@@ -62,7 +62,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-:r0:"
+                      for="radix-«r0»"
                     >
                       Light
                     </label>
@@ -80,7 +80,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       <input
                         class="_input_1e0uz_18"
                         disabled=""
-                        id="radix-:r1:"
+                        id="radix-«r1»"
                         name="themeSelector"
                         title=""
                         type="radio"
@@ -96,7 +96,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-:r1:"
+                      for="radix-«r1»"
                     >
                       Dark
                     </label>
@@ -114,7 +114,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       <input
                         class="_input_1e0uz_18"
                         disabled=""
-                        id="radix-:r2:"
+                        id="radix-«r2»"
                         name="themeSelector"
                         title=""
                         type="radio"
@@ -130,7 +130,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59 mx_ThemeChoicePanel_themeSelector_Label"
-                      for="radix-:r2:"
+                      for="radix-«r2»"
                     >
                       High contrast
                     </label>
@@ -170,7 +170,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="Modern"
                     class="_label_19upo_59"
-                    for="radix-:r3:"
+                    for="radix-«r3»"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -181,7 +181,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         <input
                           checked=""
                           class="_input_1e0uz_18"
-                          id="radix-:r3:"
+                          id="radix-«r3»"
                           name="layout"
                           title=""
                           type="radio"
@@ -297,7 +297,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="Message bubbles"
                     class="_label_19upo_59"
-                    for="radix-:rc:"
+                    for="radix-«rc»"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -307,7 +307,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       >
                         <input
                           class="_input_1e0uz_18"
-                          id="radix-:rc:"
+                          id="radix-«rc»"
                           name="layout"
                           title=""
                           type="radio"
@@ -423,7 +423,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   <label
                     aria-label="IRC (experimental)"
                     class="_label_19upo_59"
-                    for="radix-:rl:"
+                    for="radix-«rl»"
                   >
                     <div
                       class="mxLayoutSwitcher_LayoutSelector_LayoutRadio_inline"
@@ -433,7 +433,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       >
                         <input
                           class="_input_1e0uz_18"
-                          id="radix-:rl:"
+                          id="radix-«rl»"
                           name="layout"
                           title=""
                           type="radio"
@@ -557,9 +557,9 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       class="_container_19o42_10"
                     >
                       <input
-                        aria-describedby="radix-:rv:"
+                        aria-describedby="radix-«rv»"
                         class="_input_19o42_24"
-                        id="radix-:ru:"
+                        id="radix-«ru»"
                         name="compactLayout"
                         title=""
                         type="checkbox"
@@ -574,13 +574,13 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                   >
                     <label
                       class="_label_19upo_59"
-                      for="radix-:ru:"
+                      for="radix-«ru»"
                     >
                       Show compact text and messages
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id="radix-:rv:"
+                      id="radix-«rv»"
                     >
                       Modern layout must be selected to use this feature.
                     </span>
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 34d89172df..7fe1f1d49b 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
@@ -95,33 +95,6 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   />
                 </div>
               </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_QgU2PomxwKpa"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show avatars of rooms you have been invited to
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show avatars of rooms you have been invited to"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_QgU2PomxwKpa"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
             </div>
           </div>
           <div
@@ -144,7 +117,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_6hpi3YEetmBG"
+                  for="mx_SettingsFlag_QgU2PomxwKpa"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -162,7 +135,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Show all rooms in Home"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_6hpi3YEetmBG"
+                  id="mx_SettingsFlag_QgU2PomxwKpa"
                   role="switch"
                   tabindex="0"
                 >
@@ -212,7 +185,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_4yVCeEefiPqp"
+                  for="mx_SettingsFlag_6hpi3YEetmBG"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -225,7 +198,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Use Ctrl + F to search timeline"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_4yVCeEefiPqp"
+                  id="mx_SettingsFlag_6hpi3YEetmBG"
                   role="switch"
                   tabindex="0"
                 >
@@ -285,7 +258,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_MRMwbPDmfGtm"
+                  for="mx_SettingsFlag_4yVCeEefiPqp"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -298,6 +271,33 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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"
@@ -313,33 +313,6 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 <label
                   class="mx_SettingsFlag_label"
                   for="mx_SettingsFlag_GQvdMWe954DV"
-                >
-                  <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_GQvdMWe954DV"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_IAu5CsiHRD7n"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -352,7 +325,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Publish timezone on public profile"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_IAu5CsiHRD7n"
+                  id="mx_SettingsFlag_GQvdMWe954DV"
                   role="switch"
                   tabindex="0"
                 >
@@ -392,7 +365,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_yrA2ohjWVJIP"
+                  for="mx_SettingsFlag_IAu5CsiHRD7n"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -405,7 +378,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Send read receipts"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_yrA2ohjWVJIP"
+                  id="mx_SettingsFlag_IAu5CsiHRD7n"
                   role="switch"
                   tabindex="0"
                 >
@@ -419,7 +392,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_auy1OmnTidX4"
+                  for="mx_SettingsFlag_yrA2ohjWVJIP"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -432,7 +405,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Send typing notifications"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_auy1OmnTidX4"
+                  id="mx_SettingsFlag_yrA2ohjWVJIP"
                   role="switch"
                   tabindex="0"
                 >
@@ -463,7 +436,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_ePDS0OpWwAHG"
+                  for="mx_SettingsFlag_auy1OmnTidX4"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -476,7 +449,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Automatically replace plain text Emoji"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_ePDS0OpWwAHG"
+                  id="mx_SettingsFlag_auy1OmnTidX4"
                   role="switch"
                   tabindex="0"
                 >
@@ -490,7 +463,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_75JNTNkNU64r"
+                  for="mx_SettingsFlag_ePDS0OpWwAHG"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -514,6 +487,33 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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"
@@ -533,14 +533,14 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Enable Emoji suggestions while typing
+                    Use Ctrl + Enter to send a message
                   </span>
                 </label>
                 <div
-                  aria-checked="true"
+                  aria-checked="false"
                   aria-disabled="true"
-                  aria-label="Enable Emoji suggestions while typing"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
+                  aria-label="Use Ctrl + Enter to send a message"
+                  class="mx_AccessibleButton mx_ToggleSwitch"
                   id="mx_SettingsFlag_aTLcRsQRlYy7"
                   role="switch"
                   tabindex="0"
@@ -560,13 +560,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Use Ctrl + Enter to send a message
+                    Surround selected text when typing special characters
                   </span>
                 </label>
                 <div
                   aria-checked="false"
                   aria-disabled="true"
-                  aria-label="Use Ctrl + Enter to send a message"
+                  aria-label="Surround selected text when typing special characters"
                   class="mx_AccessibleButton mx_ToggleSwitch"
                   id="mx_SettingsFlag_5nfv5bOEPN1s"
                   role="switch"
@@ -587,14 +587,14 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Surround selected text when typing special characters
+                    Show stickers button
                   </span>
                 </label>
                 <div
-                  aria-checked="false"
+                  aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Surround selected text when typing special characters"
-                  class="mx_AccessibleButton mx_ToggleSwitch"
+                  aria-label="Show stickers button"
+                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_u1JYVtOyR5kb"
                   role="switch"
                   tabindex="0"
@@ -610,33 +610,6 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 <label
                   class="mx_SettingsFlag_label"
                   for="mx_SettingsFlag_u3pEwuLn9Enn"
-                >
-                  <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_u3pEwuLn9Enn"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_YuxfFEpOsztW"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -649,7 +622,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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_YuxfFEpOsztW"
+                  id="mx_SettingsFlag_u3pEwuLn9Enn"
                   role="switch"
                   tabindex="0"
                 >
@@ -680,7 +653,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_hQkBerF1ejc4"
+                  for="mx_SettingsFlag_YuxfFEpOsztW"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -693,6 +666,33 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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"
+                >
+                  <div
+                    class="mx_ToggleSwitch_ball"
+                  />
+                </div>
+              </div>
+              <div
+                class="mx_SettingsFlag"
+              >
+                <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"
@@ -708,33 +708,6 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 <label
                   class="mx_SettingsFlag_label"
                   for="mx_SettingsFlag_GFes1UFzOK2n"
-                >
-                  <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_GFes1UFzOK2n"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_vfGFMldL2r2v"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -747,7 +720,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Show line numbers in code blocks"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_vfGFMldL2r2v"
+                  id="mx_SettingsFlag_GFes1UFzOK2n"
                   role="switch"
                   tabindex="0"
                 >
@@ -778,7 +751,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_bsSwicmKUiOB"
+                  for="mx_SettingsFlag_vfGFMldL2r2v"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -791,6 +764,33 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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>
+              </div>
+              <div
+                class="mx_SettingsFlag"
+              >
+                <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"
@@ -806,33 +806,6 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                 <label
                   class="mx_SettingsFlag_label"
                   for="mx_SettingsFlag_dvqsxEaZtl3A"
-                >
-                  <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_dvqsxEaZtl3A"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_NIiWzqsApP1c"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -845,34 +818,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Autoplay videos"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_NIiWzqsApP1c"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_q1SIAPqLMVXh"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Show previews/thumbnails for images
-                  </span>
-                </label>
-                <div
-                  aria-checked="true"
-                  aria-disabled="true"
-                  aria-label="Show previews/thumbnails for images"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
-                  id="mx_SettingsFlag_q1SIAPqLMVXh"
+                  id="mx_SettingsFlag_dvqsxEaZtl3A"
                   role="switch"
                   tabindex="0"
                 >
@@ -903,7 +849,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_dXFDGgBsKXay"
+                  for="mx_SettingsFlag_NIiWzqsApP1c"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -916,6 +862,60 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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>
+              </div>
+              <div
+                class="mx_SettingsFlag"
+              >
+                <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"
+                >
+                  <div
+                    class="mx_ToggleSwitch_ball"
+                  />
+                </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"
@@ -935,13 +935,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show a placeholder for removed messages
+                    Show join/leave messages (invites/removes/bans unaffected)
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show a placeholder for removed messages"
+                  aria-label="Show join/leave messages (invites/removes/bans unaffected)"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_7Az0xw4Bs4Tt"
                   role="switch"
@@ -962,13 +962,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show read receipts sent by other users
+                    Show display name changes
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show read receipts sent by other users"
+                  aria-label="Show display name changes"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_8jmzPIlPoBCv"
                   role="switch"
@@ -989,13 +989,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show join/leave messages (invites/removes/bans unaffected)
+                    Show chat effects (animations when receiving e.g. confetti)
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show join/leave messages (invites/removes/bans unaffected)"
+                  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"
@@ -1016,13 +1016,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show display name changes
+                    Show profile picture changes
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show display name changes"
+                  aria-label="Show profile picture changes"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_bfwnd5rz4XNX"
                   role="switch"
@@ -1043,13 +1043,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show chat effects (animations when receiving e.g. confetti)
+                    Show avatars in user, room and event mentions
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show chat effects (animations when receiving e.g. confetti)"
+                  aria-label="Show avatars in user, room and event mentions"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_gs5uWEzYzZrS"
                   role="switch"
@@ -1070,13 +1070,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show profile picture changes
+                    Enable big emoji in chat
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show profile picture changes"
+                  aria-label="Enable big emoji in chat"
                   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
                   id="mx_SettingsFlag_qWg7OgID1yRR"
                   role="switch"
@@ -1097,13 +1097,13 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Show avatars in user, room and event mentions
+                    Jump to the bottom of the timeline when you send a message
                   </span>
                 </label>
                 <div
                   aria-checked="true"
                   aria-disabled="true"
-                  aria-label="Show avatars in user, room and event mentions"
+                  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"
@@ -1124,14 +1124,14 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   <span
                     class="mx_SettingsFlag_labelText"
                   >
-                    Enable big emoji in chat
+                    Show current profile picture and name for users in message history
                   </span>
                 </label>
                 <div
-                  aria-checked="true"
+                  aria-checked="false"
                   aria-disabled="true"
-                  aria-label="Enable big emoji in chat"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
+                  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"
@@ -1141,62 +1141,200 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   />
                 </div>
               </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_dJJz3lHUv9XX"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    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_dJJz3lHUv9XX"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_SBSSOZDRlzlA"
-                >
-                  <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_SBSSOZDRlzlA"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
             </div>
           </div>
+          <div
+            class="mx_SettingsSubsection mx_SettingsSubsection_newUi"
+          >
+            <div
+              class="mx_SettingsSubsectionHeading"
+            >
+              <h3
+                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
+              >
+                Moderation and safety
+              </h3>
+            </div>
+            <div
+              class="mx_SettingsSubsection_content mx_SettingsSubsection_content_newUi"
+            >
+              <form
+                class="_root_19upo_16 mx_MediaPreviewAccountSetting_Form"
+              >
+                <div
+                  class="mx_SettingsFlag mx_MediaPreviewAccountSetting_ToggleSwitch"
+                >
+                  <span
+                    class="mx_SettingsFlag_label"
+                  >
+                    <div
+                      id="mx_LabelledToggleSwitch_«r8»"
+                    >
+                      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"
+                    />
+                  </div>
+                </div>
+                <div
+                  aria-label="Show media in timeline"
+                  class="_field_19upo_26"
+                  id="mx_media_previews"
+                  role="radiogroup"
+                >
+                  <label
+                    class="_label_19upo_59"
+                    for="radix-«r9»"
+                  >
+                    Show media in timeline
+                  </label>
+                  <span
+                    class="_message_19upo_85 _help-message_19upo_91 mx_MediaPreviewAccountSetting_RadioHelp"
+                    id="radix-«ra»"
+                  >
+                    A hidden media can always be shown by tapping on it
+                  </span>
+                  <div
+                    class="_inline-field_19upo_32 mx_MediaPreviewAccountSetting_Radio"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1e0uz_10"
+                      >
+                        <input
+                          class="_input_1e0uz_18"
+                          id="mx_media_previews_off"
+                          type="radio"
+                        />
+                        <div
+                          class="_ui_1e0uz_19"
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="mx_media_previews_off"
+                      >
+                        Always hide
+                      </label>
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field_19upo_32 mx_MediaPreviewAccountSetting_Radio"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1e0uz_10"
+                      >
+                        <input
+                          class="_input_1e0uz_18"
+                          id="mx_media_previews_private"
+                          type="radio"
+                        />
+                        <div
+                          class="_ui_1e0uz_19"
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="mx_media_previews_private"
+                      >
+                        In private rooms
+                      </label>
+                    </div>
+                  </div>
+                  <div
+                    class="_inline-field_19upo_32 mx_MediaPreviewAccountSetting_Radio"
+                  >
+                    <div
+                      class="_inline-field-control_19upo_44"
+                    >
+                      <div
+                        class="_container_1e0uz_10"
+                      >
+                        <input
+                          checked=""
+                          class="_input_1e0uz_18"
+                          id="mx_media_previews_on"
+                          type="radio"
+                        />
+                        <div
+                          class="_ui_1e0uz_19"
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="_inline-field-body_19upo_38"
+                    >
+                      <label
+                        class="_label_19upo_59"
+                        for="mx_media_previews_on"
+                      >
+                        Always show
+                      </label>
+                    </div>
+                  </div>
+                </div>
+              </form>
+              <form
+                class="_root_19upo_16 mx_MediaPreviewAccountSetting_Form"
+              >
+                <div
+                  class="mx_SettingsFlag mx_MediaPreviewAccountSetting_ToggleSwitch"
+                >
+                  <span
+                    class="mx_SettingsFlag_label"
+                  >
+                    <div
+                      id="mx_LabelledToggleSwitch_«re»"
+                    >
+                      Allow users to invite you to rooms
+                    </div>
+                  </span>
+                  <div
+                    aria-checked="true"
+                    aria-disabled="true"
+                    aria-label="Your server does not implement this feature."
+                    aria-labelledby="mx_LabelledToggleSwitch_«re»"
+                    class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on"
+                    role="switch"
+                    tabindex="0"
+                  >
+                    <div
+                      class="mx_ToggleSwitch_ball"
+                    />
+                  </div>
+                </div>
+              </form>
+            </div>
+            <div
+              class="_separator_7ckbw_8"
+              data-kind="primary"
+              data-orientation="horizontal"
+              role="separator"
+            />
+          </div>
           <div
             class="mx_SettingsSubsection"
           >
@@ -1217,7 +1355,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_FLEpLCb0jpp6"
+                  for="mx_SettingsFlag_dJJz3lHUv9XX"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -1230,7 +1368,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   aria-disabled="true"
                   aria-label="Show NSFW content"
                   class="mx_AccessibleButton mx_ToggleSwitch"
-                  id="mx_SettingsFlag_FLEpLCb0jpp6"
+                  id="mx_SettingsFlag_dJJz3lHUv9XX"
                   role="switch"
                   tabindex="0"
                 >
@@ -1261,7 +1399,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
               >
                 <label
                   class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_NQFWldEwbV3q"
+                  for="mx_SettingsFlag_SBSSOZDRlzlA"
                 >
                   <span
                     class="mx_SettingsFlag_labelText"
@@ -1274,7 +1412,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
                   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_NQFWldEwbV3q"
+                  id="mx_SettingsFlag_SBSSOZDRlzlA"
                   role="switch"
                   tabindex="0"
                 >
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 94fc6bd545..ffa91ae7b1 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,5 +1,31 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`<SecurityUserSettingsTab /> renders ignored users 1`] = `
+<ul
+  aria-label="Ignored users"
+  class="mx_SecurityUserSettingsTab_ignoredUsers"
+>
+  <li
+    aria-label="@bob:example.org"
+    class="mx_SecurityUserSettingsTab_ignoredUser"
+  >
+    <div
+      aria-describedby="mx_SecurityUserSettingsTab_ignoredUser_@bob:example.org"
+      class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
+      role="button"
+      tabindex="0"
+    >
+      Unignore
+    </div>
+    <span
+      id="mx_SecurityUserSettingsTab_ignoredUser_@bob:example.org"
+    >
+      @bob:example.org
+    </span>
+  </li>
+</ul>
+`;
+
 exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
 <div>
   <div
@@ -94,90 +120,6 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
         <div
           class="mx_SettingsSection_subSections"
         >
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Secure Backup
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsSubsection_text"
-              >
-                Back up your encryption keys with your account data in case you lose access to your sessions. Your keys will be secured with a unique Recovery Key.
-              </div>
-              <div
-                class="mx_Spinner"
-              >
-                <div
-                  aria-label="Loading…"
-                  class="mx_Spinner_icon"
-                  data-testid="spinner"
-                  role="progressbar"
-                  style="width: 32px; height: 32px;"
-                />
-              </div>
-              <details>
-                <summary
-                  class="mx_SecureBackupPanel_advanced"
-                >
-                  Advanced
-                </summary>
-                <table
-                  class="mx_SecureBackupPanel_statusList"
-                >
-                  <tr>
-                    <th
-                      scope="row"
-                    >
-                      Backup key stored:
-                    </th>
-                    <td>
-                      not stored
-                    </td>
-                  </tr>
-                  <tr>
-                    <th
-                      scope="row"
-                    >
-                      Backup key cached:
-                    </th>
-                    <td>
-                      not found locally
-                    </td>
-                  </tr>
-                  <tr>
-                    <th
-                      scope="row"
-                    >
-                      Secret storage public key:
-                    </th>
-                    <td>
-                      not found
-                    </td>
-                  </tr>
-                  <tr>
-                    <th
-                      scope="row"
-                    >
-                      Secret storage:
-                    </th>
-                    <td>
-                      not ready
-                    </td>
-                  </tr>
-                </table>
-              </details>
-            </div>
-          </div>
           <div
             class="mx_SettingsSubsection"
           >
@@ -214,203 +156,6 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
               </div>
             </div>
           </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Cross-signing
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_Spinner"
-              >
-                <div
-                  aria-label="Loading…"
-                  class="mx_Spinner_icon"
-                  data-testid="spinner"
-                  role="progressbar"
-                  style="width: 32px; height: 32px;"
-                />
-              </div>
-              <details>
-                <summary
-                  class="mx_CrossSigningPanel_advanced"
-                >
-                  Advanced
-                </summary>
-                <table
-                  class="mx_CrossSigningPanel_statusList"
-                >
-                  <tbody>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Cross-signing public keys:
-                      </th>
-                      <td>
-                        not found
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Cross-signing private keys:
-                      </th>
-                      <td>
-                        not found in storage
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Master private key:
-                      </th>
-                      <td>
-                        not found locally
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Self signing private key:
-                      </th>
-                      <td>
-                        not found locally
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        User signing private key:
-                      </th>
-                      <td>
-                        not found locally
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Homeserver feature support:
-                      </th>
-                      <td>
-                        not found
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </details>
-            </div>
-          </div>
-          <div
-            class="mx_SettingsSubsection"
-          >
-            <div
-              class="mx_SettingsSubsectionHeading"
-            >
-              <h3
-                class="mx_Heading_h4 mx_SettingsSubsectionHeading_heading"
-              >
-                Cryptography
-              </h3>
-            </div>
-            <div
-              class="mx_SettingsSubsection_content"
-            >
-              <div
-                class="mx_SettingsSubsection_text"
-              >
-                <table
-                  class="mx_CryptographyPanel_sessionInfo"
-                >
-                  <tbody>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Session ID:
-                      </th>
-                      <td>
-                        <code />
-                      </td>
-                    </tr>
-                    <tr>
-                      <th
-                        scope="row"
-                      >
-                        Session key:
-                      </th>
-                      <td>
-                        <code>
-                          <strong>
-                            ...
-                          </strong>
-                        </code>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div
-                class="mx_CryptographyPanel_importExportButtons"
-              >
-                <div
-                  class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
-                  role="button"
-                  tabindex="0"
-                >
-                  Export E2E room keys
-                </div>
-                <div
-                  class="mx_AccessibleButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_outline"
-                  role="button"
-                  tabindex="0"
-                >
-                  Import E2E room keys
-                </div>
-              </div>
-              <div
-                class="mx_SettingsFlag"
-              >
-                <label
-                  class="mx_SettingsFlag_label"
-                  for="mx_SettingsFlag_vY7Q4uEh9K38"
-                >
-                  <span
-                    class="mx_SettingsFlag_labelText"
-                  >
-                    Only send messages to verified users
-                  </span>
-                </label>
-                <div
-                  aria-checked="false"
-                  aria-disabled="false"
-                  aria-label="Only send messages to verified users"
-                  class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_enabled"
-                  id="mx_SettingsFlag_vY7Q4uEh9K38"
-                  role="switch"
-                  tabindex="0"
-                >
-                  <div
-                    class="mx_ToggleSwitch_ball"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
       <div
@@ -468,7 +213,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                     >
                       <label
                         class="_label_19upo_59"
-                        for="radix-:r1:"
+                        for="radix-«r1»"
                       >
                         Enter a new identity server
                       </label>
@@ -477,7 +222,7 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                       >
                         <input
                           class="_control_sqdq4_10"
-                          id="radix-:r1:"
+                          id="radix-«r1»"
                           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 173876b0c3..c417e39156 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
@@ -397,7 +397,7 @@ exports[`<SessionManagerTab /> goes to filtered list from security recommendatio
           >
             <input
               aria-label="Select all"
-              aria-labelledby=":r4q:"
+              aria-labelledby="«r4q»"
               class="_input_1hel1_18"
               data-testid="device-select-all-checkbox"
               id="device-select-all-checkbox"
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 ff79aa184d..0557761e2b 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
@@ -51,7 +51,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r1:"
+                        aria-describedby="«r1»"
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
@@ -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="«r1»"
                     >
                       Home is useful for getting an overview of everything.
                     </span>
@@ -119,7 +119,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r5:"
+                        aria-describedby="«r5»"
                         class="_input_1hel1_18"
                         data-testid="mx_SidebarUserSettingsTab_homeAllRoomsCheckbox"
                         id="checkbox_38QgU2Pomx"
@@ -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="«r5»"
                     >
                       Show all your rooms in Home, even if they're in a space.
                     </span>
@@ -174,7 +174,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r9:"
+                        aria-describedby="«r9»"
                         class="_input_1hel1_18"
                         id="checkbox_wKpa6hpi3Y"
                         type="checkbox"
@@ -220,7 +220,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r9:"
+                      id="«r9»"
                     >
                       Group all your favourite rooms and people in one place.
                     </span>
@@ -240,7 +240,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rd:"
+                        aria-describedby="«rd»"
                         class="_input_1hel1_18"
                         id="checkbox_EetmBG4yVC"
                         type="checkbox"
@@ -289,7 +289,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rd:"
+                      id="«rd»"
                     >
                       Group all your people in one place.
                     </span>
@@ -309,7 +309,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rh:"
+                        aria-describedby="«rh»"
                         class="_input_1hel1_18"
                         id="checkbox_eEefiPqpMR"
                         type="checkbox"
@@ -343,7 +343,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rh:"
+                      id="«rh»"
                     >
                       Group all your rooms that aren't part of a space in one place.
                     </span>
@@ -363,7 +363,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rl:"
+                        aria-describedby="«rl»"
                         class="_input_1hel1_18"
                         id="checkbox_MwbPDmfGtm"
                         type="checkbox"
@@ -409,7 +409,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings with guest spa url
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rl:"
+                      id="«rl»"
                     >
                       Group all private video rooms and conferences. In conferences you can invite people outside of matrix.
                     </span>
@@ -476,7 +476,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rp:"
+                        aria-describedby="«rp»"
                         checked=""
                         class="_input_1hel1_18"
                         disabled=""
@@ -524,7 +524,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rp:"
+                      id="«rp»"
                     >
                       Home is useful for getting an overview of everything.
                     </span>
@@ -544,7 +544,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":rt:"
+                        aria-describedby="«rt»"
                         class="_input_1hel1_18"
                         data-testid="mx_SidebarUserSettingsTab_homeAllRoomsCheckbox"
                         id="checkbox_38QgU2Pomx"
@@ -579,7 +579,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":rt:"
+                      id="«rt»"
                     >
                       Show all your rooms in Home, even if they're in a space.
                     </span>
@@ -599,7 +599,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r11:"
+                        aria-describedby="«r11»"
                         class="_input_1hel1_18"
                         id="checkbox_wKpa6hpi3Y"
                         type="checkbox"
@@ -645,7 +645,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r11:"
+                      id="«r11»"
                     >
                       Group all your favourite rooms and people in one place.
                     </span>
@@ -665,7 +665,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r15:"
+                        aria-describedby="«r15»"
                         class="_input_1hel1_18"
                         id="checkbox_EetmBG4yVC"
                         type="checkbox"
@@ -714,7 +714,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r15:"
+                      id="«r15»"
                     >
                       Group all your people in one place.
                     </span>
@@ -734,7 +734,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r19:"
+                        aria-describedby="«r19»"
                         class="_input_1hel1_18"
                         id="checkbox_eEefiPqpMR"
                         type="checkbox"
@@ -768,7 +768,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r19:"
+                      id="«r19»"
                     >
                       Group all your rooms that aren't part of a space in one place.
                     </span>
@@ -788,7 +788,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                       class="_container_1hel1_10"
                     >
                       <input
-                        aria-describedby=":r1d:"
+                        aria-describedby="«r1d»"
                         class="_input_1hel1_18"
                         id="checkbox_MwbPDmfGtm"
                         type="checkbox"
@@ -834,7 +834,7 @@ exports[`<SidebarUserSettingsTab /> renders sidebar settings without guest spa u
                     </label>
                     <span
                       class="_message_19upo_85 _help-message_19upo_91"
-                      id=":r1d:"
+                      id="«r1d»"
                     >
                       Group all private video rooms and conferences.
                     </span>
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 5d8bd993dc..5086a8aafc 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
@@ -8,7 +8,6 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
   >
     <div
       class="mx_UserMenu"
-      data-floating-ui-inert=""
     >
       <div
         aria-expanded="false"
@@ -43,7 +42,6 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
     <ul
       aria-label="Spaces"
       class="mx_AutoHideScrollbar mx_SpaceTreeLevel"
-      data-floating-ui-inert=""
       data-rbd-droppable-context-id="0"
       data-rbd-droppable-id="top-level-spaces"
       role="tree"
@@ -231,17 +229,18 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls=":r12:"
-        aria-describedby=":r12:"
-        aria-expanded="true"
-        aria-haspopup="dialog"
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
         aria-label="Threads"
-        aria-labelledby=":r14:"
+        aria-labelledby="«r12»"
         class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
-        data-floating-ui-inert=""
+        data-state="closed"
+        id="radix-«r10»"
         role="button"
         style="--cpd-icon-button-size: 32px;"
         tabindex="0"
+        type="button"
       >
         <div
           class="_indicator-icon_zr2a0_17"
@@ -261,37 +260,11 @@ exports[`<SpacePanel /> should show all activated MetaSpaces in the correct orde
           </svg>
         </div>
       </button>
-      <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=":r19:"
-        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"
-      />
     </div>
     <div
       aria-expanded="false"
       aria-label="Quick settings"
       class="mx_AccessibleButton mx_QuickSettingsButton"
-      data-floating-ui-inert=""
       role="button"
       tabindex="0"
     />
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 16528bce19..9e9ab218bc 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
@@ -4,7 +4,7 @@ exports[`<SpaceSettingsVisibilityTab /> for a public space Access renders guest
 <div
   aria-checked="true"
   aria-disabled="false"
-  aria-labelledby="mx_LabelledToggleSwitch_testid_1"
+  aria-labelledby="mx_LabelledToggleSwitch_«rb»"
   class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
   role="switch"
   tabindex="0"
@@ -122,7 +122,7 @@ exports[`<SpaceSettingsVisibilityTab /> renders container 1`] = `
                     class="mx_SettingsFlag_label"
                   >
                     <div
-                      id="mx_LabelledToggleSwitch_testid_0"
+                      id="mx_LabelledToggleSwitch_«r0»"
                     >
                       Preview Space
                     </div>
@@ -130,7 +130,7 @@ exports[`<SpaceSettingsVisibilityTab /> renders container 1`] = `
                   <div
                     aria-checked="true"
                     aria-disabled="false"
-                    aria-labelledby="mx_LabelledToggleSwitch_testid_0"
+                    aria-labelledby="mx_LabelledToggleSwitch_«r0»"
                     class="mx_AccessibleButton mx_ToggleSwitch mx_ToggleSwitch_on mx_ToggleSwitch_enabled"
                     role="switch"
                     tabindex="0"
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 535e95d4d9..41eefaf277 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
@@ -2,7 +2,7 @@
 
 exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] = `
 <div
-  aria-labelledby="radix-:r33:"
+  aria-labelledby="radix-«r2f»"
   aria-orientation="vertical"
   class="_menu_19sse_8"
   data-align="start"
@@ -11,14 +11,14 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-:r34:"
+  id="radix-«r2g»"
   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:"
+    id="«r2n»"
   >
     Threads activity
   </h3>
@@ -26,7 +26,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
     class="mx_ThreadsActivityCentre_rows"
   >
     <button
-      class="mx_ThreadsActivityCentreRow _item_1x5l4_8 _interactive_1x5l4_26"
+      class="mx_ThreadsActivityCentreRow _item_dyt4i_8 _interactive_dyt4i_26"
       data-kind="primary"
       data-orientation="vertical"
       data-radix-collection-item=""
@@ -34,7 +34,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
       tabindex="-1"
     >
       <div
-        class="_icon_1x5l4_34"
+        class="_icon_dyt4i_50"
       >
         <span
           class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
@@ -48,13 +48,13 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
         </span>
       </div>
       <span
-        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
       >
         This is a real highlight
       </span>
       <svg
         aria-hidden="true"
-        class="_nav-hint_1x5l4_50"
+        class="_nav-hint_dyt4i_59"
         fill="currentColor"
         height="24"
         viewBox="8 0 8 24"
@@ -74,7 +74,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
       </div>
     </button>
     <button
-      class="mx_ThreadsActivityCentreRow _item_1x5l4_8 _interactive_1x5l4_26"
+      class="mx_ThreadsActivityCentreRow _item_dyt4i_8 _interactive_dyt4i_26"
       data-kind="primary"
       data-orientation="vertical"
       data-radix-collection-item=""
@@ -82,7 +82,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
       tabindex="-1"
     >
       <div
-        class="_icon_1x5l4_34"
+        class="_icon_dyt4i_50"
       >
         <span
           class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
@@ -96,13 +96,13 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] =
         </span>
       </div>
       <span
-        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
       >
         A notification
       </span>
       <svg
         aria-hidden="true"
-        class="_nav-hint_1x5l4_50"
+        class="_nav-hint_dyt4i_59"
         fill="currentColor"
         height="24"
         viewBox="8 0 8 24"
@@ -145,15 +145,15 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls="radix-:r1d:"
+        aria-controls="radix-«rp»"
         aria-disabled="false"
         aria-expanded="true"
         aria-haspopup="menu"
         aria-label="Threads"
-        aria-labelledby=":r1e:"
+        aria-labelledby="«rq»"
         class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
         data-state="open"
-        id="radix-:r1c:"
+        id="radix-«ro»"
         role="button"
         style="--cpd-icon-button-size: 32px;"
         tabindex="0"
@@ -183,7 +183,7 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
     aria-hidden="true"
     data-aria-hidden="true"
     data-floating-ui-portal=""
-    id=":r1i:"
+    id="«ru»"
   >
     <div
       class="_tooltip_6ode6_8 _invisible_6ode6_21"
@@ -204,7 +204,7 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
           stroke="none"
         />
         <clippath
-          id=":r1j:"
+          id="«rv»"
         >
           <rect
             height="10"
@@ -215,7 +215,7 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
         </clippath>
       </svg>
       <span
-        id=":r1e:"
+        id="«rq»"
       >
         Threads
       </span>
@@ -224,10 +224,10 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
   <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-available-width: 0px; --radix-popper-available-height: -8px; --radix-popper-anchor-width: 0px; --radix-popper-anchor-height: 0px; --radix-popper-transform-origin: 0% 0px;"
+    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-:r1c:"
+      aria-labelledby="radix-«ro»"
       aria-orientation="vertical"
       class="_menu_19sse_8"
       data-align="start"
@@ -236,14 +236,14 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
       data-side="top"
       data-state="open"
       dir="ltr"
-      id="radix-:r1d:"
+      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=":r1k:"
+        id="«r10»"
       >
         Threads activity
       </h3>
@@ -270,7 +270,7 @@ exports[`ThreadsActivityCentre should close the release announcement when the TA
 
 exports[`ThreadsActivityCentre should match snapshot when empty 1`] = `
 <div
-  aria-labelledby="radix-:r3n:"
+  aria-labelledby="radix-«r33»"
   aria-orientation="vertical"
   class="_menu_19sse_8"
   data-align="start"
@@ -279,14 +279,14 @@ exports[`ThreadsActivityCentre should match snapshot when empty 1`] = `
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-:r3o:"
+  id="radix-«r34»"
   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=":r3v:"
+    id="«r3b»"
   >
     Threads activity
   </h3>
@@ -304,7 +304,7 @@ 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-:r40:"
+  aria-labelledby="radix-«r3c»"
   aria-orientation="vertical"
   class="_menu_19sse_8"
   data-align="start"
@@ -313,14 +313,14 @@ exports[`ThreadsActivityCentre should order the room with the same notification
   data-side="top"
   data-state="open"
   dir="ltr"
-  id="radix-:r41:"
+  id="radix-«r3d»"
   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=":r48:"
+    id="«r3k»"
   >
     Threads activity
   </h3>
@@ -328,7 +328,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
     class="mx_ThreadsActivityCentre_rows"
   >
     <button
-      class="mx_ThreadsActivityCentreRow _item_1x5l4_8 _interactive_1x5l4_26"
+      class="mx_ThreadsActivityCentreRow _item_dyt4i_8 _interactive_dyt4i_26"
       data-kind="primary"
       data-orientation="vertical"
       data-radix-collection-item=""
@@ -336,7 +336,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
       tabindex="-1"
     >
       <div
-        class="_icon_1x5l4_34"
+        class="_icon_dyt4i_50"
       >
         <span
           class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
@@ -350,13 +350,13 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         </span>
       </div>
       <span
-        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
       >
         This is a third real highlight
       </span>
       <svg
         aria-hidden="true"
-        class="_nav-hint_1x5l4_50"
+        class="_nav-hint_dyt4i_59"
         fill="currentColor"
         height="24"
         viewBox="8 0 8 24"
@@ -376,7 +376,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
       </div>
     </button>
     <button
-      class="mx_ThreadsActivityCentreRow _item_1x5l4_8 _interactive_1x5l4_26"
+      class="mx_ThreadsActivityCentreRow _item_dyt4i_8 _interactive_dyt4i_26"
       data-kind="primary"
       data-orientation="vertical"
       data-radix-collection-item=""
@@ -384,7 +384,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
       tabindex="-1"
     >
       <div
-        class="_icon_1x5l4_34"
+        class="_icon_dyt4i_50"
       >
         <span
           class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
@@ -398,13 +398,13 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         </span>
       </div>
       <span
-        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
       >
         This is a real highlight
       </span>
       <svg
         aria-hidden="true"
-        class="_nav-hint_1x5l4_50"
+        class="_nav-hint_dyt4i_59"
         fill="currentColor"
         height="24"
         viewBox="8 0 8 24"
@@ -424,7 +424,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
       </div>
     </button>
     <button
-      class="mx_ThreadsActivityCentreRow _item_1x5l4_8 _interactive_1x5l4_26"
+      class="mx_ThreadsActivityCentreRow _item_dyt4i_8 _interactive_dyt4i_26"
       data-kind="primary"
       data-orientation="vertical"
       data-radix-collection-item=""
@@ -432,7 +432,7 @@ exports[`ThreadsActivityCentre should order the room with the same notification
       tabindex="-1"
     >
       <div
-        class="_icon_1x5l4_34"
+        class="_icon_dyt4i_50"
       >
         <span
           class="_avatar_1qbcf_8 mx_BaseAvatar _avatar-imageless_1qbcf_52"
@@ -446,13 +446,13 @@ exports[`ThreadsActivityCentre should order the room with the same notification
         </span>
       </div>
       <span
-        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_1x5l4_43"
+        class="_typography_6v6n8_153 _font-body-md-medium_6v6n8_60 _label_dyt4i_34"
       >
         This is a second real highlight
       </span>
       <svg
         aria-hidden="true"
-        class="_nav-hint_1x5l4_50"
+        class="_nav-hint_dyt4i_59"
         fill="currentColor"
         height="24"
         viewBox="8 0 8 24"
@@ -482,17 +482,18 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
       class="mx_ThreadsActivityCentre_container"
     >
       <button
-        aria-controls=":ra:"
-        aria-describedby=":ra:"
-        aria-expanded="true"
-        aria-haspopup="dialog"
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="menu"
         aria-label="Threads"
-        aria-labelledby=":rc:"
+        aria-labelledby="«ra»"
         class="_icon-button_m2erp_8 mx_ThreadsActivityCentreButton"
-        data-floating-ui-inert=""
+        data-state="closed"
+        id="radix-«r8»"
         role="button"
         style="--cpd-icon-button-size: 32px;"
         tabindex="0"
+        type="button"
       >
         <div
           class="_indicator-icon_zr2a0_17"
@@ -512,37 +513,11 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
           </svg>
         </div>
       </button>
-      <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=":rh:"
-        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"
-      />
     </div>
   </div>
   <div
-    data-floating-ui-inert=""
     data-floating-ui-portal=""
-    id=":rg:"
+    id="«re»"
   >
     <div
       class="_tooltip_6ode6_8 _invisible_6ode6_21"
@@ -563,7 +538,7 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
           stroke="none"
         />
         <clippath
-          id=":ri:"
+          id="«rf»"
         >
           <rect
             height="10"
@@ -574,85 +549,11 @@ exports[`ThreadsActivityCentre should render the release announcement 1`] = `
         </clippath>
       </svg>
       <span
-        id=":rc:"
+        id="«ra»"
       >
         Threads
       </span>
     </div>
   </div>
-  <div
-    data-floating-ui-portal=""
-    id=":rh:"
-  >
-    <span
-      data-floating-ui-focus-guard=""
-      data-type="inside"
-      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"
-    />
-    <div
-      aria-describedby=":r9:"
-      aria-labelledby=":r8:"
-      class="_content_3xq91_8"
-      data-floating-ui-focusable=""
-      id=":ra:"
-      role="dialog"
-      style="position: absolute; left: 0px; top: 0px; transform: translate(0px, 0px);"
-      tabindex="-1"
-    >
-      <svg
-        aria-hidden="true"
-        class="_arrow_3xq91_53"
-        height="20"
-        style="position: absolute; pointer-events: none; right: calc(100% - 0px); transform: rotate(90deg);"
-        viewBox="0 0 20 20"
-        width="20"
-      >
-        <path
-          d="M0,0 H20 L10,12 Q10,12 10,12 Z"
-          stroke="none"
-        />
-        <clippath
-          id=":rj:"
-        >
-          <rect
-            height="20"
-            width="20"
-            x="0"
-            y="0"
-          />
-        </clippath>
-      </svg>
-      <h3
-        class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74 _header_3xq91_37"
-        id=":r8:"
-      >
-        Threads Activity Centre
-      </h3>
-      <span
-        class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31 _description_3xq91_43"
-        id=":r9:"
-      >
-        Threads notifications have moved, find them here from now on.
-      </span>
-      <button
-        class="_button_vczzf_8 _button_3xq91_48"
-        data-kind="secondary"
-        data-size="sm"
-        role="button"
-        tabindex="0"
-      >
-        OK
-      </button>
-    </div>
-    <span
-      data-floating-ui-focus-guard=""
-      data-type="inside"
-      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"
-    />
-  </div>
 </body>
 `;
diff --git a/test/unit-tests/components/views/voip/LegacyCallView-test.tsx b/test/unit-tests/components/views/voip/LegacyCallView-test.tsx
new file mode 100644
index 0000000000..ee1f4fe326
--- /dev/null
+++ b/test/unit-tests/components/views/voip/LegacyCallView-test.tsx
@@ -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 React from "react";
+import { render } from "jest-matrix-react";
+import { type MatrixCall } from "matrix-js-sdk/src/matrix";
+
+import LegacyCallView from "../../../../../src/components/views/voip/LegacyCallView";
+import { stubClient } from "../../../../test-utils";
+
+describe("LegacyCallView", () => {
+    it("should exit full screen on unmount", () => {
+        const element = document.createElement("div");
+        // @ts-expect-error
+        document.fullscreenElement = element;
+        document.exitFullscreen = jest.fn();
+
+        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;
+
+        const { unmount } = render(<LegacyCallView call={call} />);
+        expect(document.exitFullscreen).not.toHaveBeenCalled();
+        unmount();
+        expect(document.exitFullscreen).toHaveBeenCalled();
+    });
+});
diff --git a/test/unit-tests/dispatcher/dispatcher-test.ts b/test/unit-tests/dispatcher/dispatcher-test.ts
index 711fad2b5e..4b8fc31d28 100644
--- a/test/unit-tests/dispatcher/dispatcher-test.ts
+++ b/test/unit-tests/dispatcher/dispatcher-test.ts
@@ -6,8 +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 { defer } from "matrix-js-sdk/src/utils";
-
 import defaultDispatcher from "../../../src/dispatcher/dispatcher";
 import { Action } from "../../../src/dispatcher/actions";
 import { AsyncActionPayload } from "../../../src/dispatcher/payloads";
@@ -20,8 +18,8 @@ describe("MatrixDispatcher", () => {
     });
 
     it("should execute callbacks in registered order", async () => {
-        const deferred1 = defer<number>();
-        const deferred2 = defer<number>();
+        const deferred1 = Promise.withResolvers<number>();
+        const deferred2 = Promise.withResolvers<number>();
 
         const fn1 = jest.fn(() => deferred1.resolve(1));
         const fn2 = jest.fn(() => deferred2.resolve(2));
@@ -36,8 +34,8 @@ describe("MatrixDispatcher", () => {
     });
 
     it("should skip the queue for the given callback", async () => {
-        const deferred1 = defer<number>();
-        const deferred2 = defer<number>();
+        const deferred1 = Promise.withResolvers<number>();
+        const deferred2 = Promise.withResolvers<number>();
 
         const fn1 = jest.fn(() => deferred1.resolve(1));
         const fn2 = jest.fn(() => deferred2.resolve(2));
diff --git a/test/unit-tests/hooks/useMediaVisible-test.tsx b/test/unit-tests/hooks/useMediaVisible-test.tsx
index cafc32f1bf..d8f71b764a 100644
--- a/test/unit-tests/hooks/useMediaVisible-test.tsx
+++ b/test/unit-tests/hooks/useMediaVisible-test.tsx
@@ -6,48 +6,74 @@ 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 { useMediaVisible } from "../../../src/hooks/useMediaVisible";
+import { createTestClient, mkStubRoom, withClientContextRenderOptions } from "../../test-utils";
+import { type MediaPreviewConfig, MediaPreviewValue } from "../../../src/@types/media_preview";
+import MediaPreviewConfigController from "../../../src/settings/controllers/MediaPreviewConfigController";
 import SettingsStore from "../../../src/settings/SettingsStore";
-import { SettingLevel } from "../../../src/settings/SettingLevel";
 
 const EVENT_ID = "$fibble:example.org";
-
-function render() {
-    return renderHook(() => useMediaVisible(EVENT_ID));
-}
+const ROOM_ID = "!foobar:example.org";
 
 describe("useMediaVisible", () => {
-    afterEach(() => {
-        // Using act here as otherwise React warns about state updates not being wrapped.
-        act(() => {
-            SettingsStore.setValue(
-                "showMediaEventIds",
-                null,
-                SettingLevel.DEVICE,
-                SettingsStore.getDefaultValue("showMediaEventIds"),
-            );
-            SettingsStore.setValue(
-                "showImages",
-                null,
-                SettingLevel.DEVICE,
-                SettingsStore.getDefaultValue("showImages"),
-            );
+    let matrixClient: MatrixClient;
+    let room: Room;
+    const mediaPreviewConfig: MediaPreviewConfig = MediaPreviewConfigController.default;
+
+    function render() {
+        return renderHook(() => useMediaVisible(EVENT_ID, ROOM_ID), withClientContextRenderOptions(matrixClient));
+    }
+    beforeEach(() => {
+        matrixClient = createTestClient();
+        room = mkStubRoom(ROOM_ID, undefined, matrixClient);
+        matrixClient.getRoom = jest.fn().mockReturnValue(room);
+        const origFn = SettingsStore.getValue;
+        jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => {
+            if (setting === "mediaPreviewConfig") {
+                return mediaPreviewConfig;
+            }
+            return origFn(setting, ...args);
         });
     });
 
-    it("should display images by default", async () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it("should display media by default", async () => {
         const { result } = render();
         expect(result.current[0]).toEqual(true);
     });
 
-    it("should hide images when the default is changed", async () => {
-        SettingsStore.setValue("showImages", null, SettingLevel.DEVICE, false);
+    it("should hide media when media previews are Off", async () => {
+        mediaPreviewConfig.media_previews = MediaPreviewValue.Off;
         const { result } = render();
         expect(result.current[0]).toEqual(false);
     });
 
-    it("should hide images after function is called", async () => {
+    it.each([[JoinRule.Invite], [JoinRule.Knock], [JoinRule.Restricted]])(
+        "should display media when media previews are Private and the join rule is %s",
+        async (rule) => {
+            mediaPreviewConfig.media_previews = MediaPreviewValue.Private;
+            room.currentState.getJoinRule = jest.fn().mockReturnValue(rule);
+            const { result } = render();
+            expect(result.current[0]).toEqual(true);
+        },
+    );
+
+    it.each([[JoinRule.Public], ["anything_else"]])(
+        "should hide media when media previews are Private and the join rule is %s",
+        async (rule) => {
+            mediaPreviewConfig.media_previews = MediaPreviewValue.Private;
+            room.currentState.getJoinRule = jest.fn().mockReturnValue(rule);
+            const { result } = render();
+            expect(result.current[0]).toEqual(false);
+        },
+    );
+
+    it("should hide media after function is called", async () => {
         const { result } = render();
         expect(result.current[0]).toEqual(true);
         act(() => {
@@ -57,8 +83,8 @@ describe("useMediaVisible", () => {
             expect(result.current[0]).toEqual(false);
         });
     });
-    it("should show images after function is called", async () => {
-        SettingsStore.setValue("showImages", null, SettingLevel.DEVICE, false);
+    it("should show media after function is called", async () => {
+        mediaPreviewConfig.media_previews = MediaPreviewValue.Off;
         const { result } = render();
         expect(result.current[0]).toEqual(false);
         act(() => {
diff --git a/test/unit-tests/hooks/useProfileInfo-test.tsx b/test/unit-tests/hooks/useProfileInfo-test.tsx
index 0294771de3..41e026f169 100644
--- a/test/unit-tests/hooks/useProfileInfo-test.tsx
+++ b/test/unit-tests/hooks/useProfileInfo-test.tsx
@@ -40,9 +40,10 @@ describe("useProfileInfo", () => {
             result.current.search({ query });
         });
 
-        await waitFor(() => expect(result.current.ready).toBe(true));
-
-        expect(result.current.profile?.display_name).toBe(query);
+        await waitFor(() => {
+            expect(result.current.ready).toBe(true);
+            expect(result.current.profile?.display_name).toBe(query);
+        });
     });
 
     it("should work with empty queries", async () => {
diff --git a/test/unit-tests/hooks/usePublicRoomDirectory-test.tsx b/test/unit-tests/hooks/usePublicRoomDirectory-test.tsx
index 5c1b2a8ac4..b5f9a4d2f5 100644
--- a/test/unit-tests/hooks/usePublicRoomDirectory-test.tsx
+++ b/test/unit-tests/hooks/usePublicRoomDirectory-test.tsx
@@ -77,9 +77,8 @@ describe("usePublicRoomDirectory", () => {
 
         await waitFor(() => {
             expect(result.current.ready).toBe(true);
+            expect(result.current.publicRooms[0].name).toEqual(query);
         });
-
-        expect(result.current.publicRooms[0].name).toEqual(query);
     });
 
     it("should recover from a server exception", async () => {
diff --git a/test/unit-tests/hooks/useUserDirectory-test.tsx b/test/unit-tests/hooks/useUserDirectory-test.tsx
index c71b0d924d..002b9377b4 100644
--- a/test/unit-tests/hooks/useUserDirectory-test.tsx
+++ b/test/unit-tests/hooks/useUserDirectory-test.tsx
@@ -45,9 +45,11 @@ describe("useUserDirectory", () => {
         act(() => {
             result.current.search({ limit: 1, query });
         });
-        await waitFor(() => expect(result.current.ready).toBe(true));
+        await waitFor(() => {
+            expect(result.current.ready).toBe(true);
+            expect(result.current.loading).toBe(false);
+        });
 
-        expect(result.current.loading).toBe(false);
         expect(result.current.users[0].name).toBe(query);
     });
 
diff --git a/test/unit-tests/images/static-logo-extended-file-format.webp b/test/unit-tests/images/static-logo-extended-file-format.webp
new file mode 100644
index 0000000000..bb4364374b
Binary files /dev/null and b/test/unit-tests/images/static-logo-extended-file-format.webp differ
diff --git a/test/unit-tests/languageHandler-test.tsx b/test/unit-tests/languageHandler-test.tsx
index 19107aaf27..c69eefd85c 100644
--- a/test/unit-tests/languageHandler-test.tsx
+++ b/test/unit-tests/languageHandler-test.tsx
@@ -26,6 +26,7 @@ import {
     type TranslationKey,
     type IVariables,
     type Tags,
+    getLanguagesFromBrowser,
 } from "../../src/languageHandler";
 import { stubClient } from "../test-utils";
 import { setupLanguageMock } from "../setup/setupLanguage";
@@ -198,6 +199,29 @@ describe("languageHandler", () => {
             setupLanguageMock(); // restore language mock
         });
     });
+
+    describe("getLanguagesFromBrowser", () => {
+        beforeEach(() => {
+            jest.restoreAllMocks();
+        });
+
+        it("should return navigator.languages if available", () => {
+            jest.spyOn(window.navigator, "languages", "get").mockReturnValue(["en", "de"]);
+            expect(getLanguagesFromBrowser()).toEqual(["en", "de"]);
+        });
+
+        it("should return navigator.language if available", () => {
+            jest.spyOn(window.navigator, "languages", "get").mockReturnValue([]);
+            jest.spyOn(window.navigator, "language", "get").mockReturnValue("de");
+            expect(getLanguagesFromBrowser()).toEqual(["de"]);
+        });
+
+        it("should return 'en' otherwise", () => {
+            jest.spyOn(window.navigator, "languages", "get").mockReturnValue([]);
+            jest.spyOn(window.navigator, "language", "get").mockReturnValue(undefined as any);
+            expect(getLanguagesFromBrowser()).toEqual(["en"]);
+        });
+    });
 });
 
 describe("languageHandler JSX", function () {
diff --git a/test/unit-tests/models/Call-test.ts b/test/unit-tests/models/Call-test.ts
index c8f9d50334..de5c42fc9c 100644
--- a/test/unit-tests/models/Call-test.ts
+++ b/test/unit-tests/models/Call-test.ts
@@ -34,7 +34,6 @@ import type { Mocked } from "jest-mock";
 import type { ClientWidgetApi } from "matrix-widget-api";
 import {
     type JitsiCallMemberContent,
-    Layout,
     Call,
     CallEvent,
     ConnectionState,
@@ -895,13 +894,6 @@ describe("ElementCall", () => {
             expect(call.connectionState).toBe(ConnectionState.Connected);
         });
 
-        it("fails to connect if the widget returns an error", async () => {
-            // we only send a JoinCall action if the widget is preloading
-            call.widget.data = { ...call.widget, preload: true };
-            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 callConnectProcedure(call);
             mocked(messaging.transport).send.mockRejectedValue(new Error("never!!1! >:("));
@@ -948,33 +940,6 @@ describe("ElementCall", () => {
             expect(call.connectionState).toBe(ConnectionState.Disconnected);
         });
 
-        it("tracks layout", async () => {
-            await callConnectProcedure(call);
-            expect(call.layout).toBe(Layout.Tile);
-
-            messaging.emit(
-                `action:${ElementWidgetActions.SpotlightLayout}`,
-                new CustomEvent("widgetapirequest", { detail: {} }),
-            );
-            expect(call.layout).toBe(Layout.Spotlight);
-
-            messaging.emit(
-                `action:${ElementWidgetActions.TileLayout}`,
-                new CustomEvent("widgetapirequest", { detail: {} }),
-            );
-            expect(call.layout).toBe(Layout.Tile);
-        });
-
-        it("sets layout", async () => {
-            await callConnectProcedure(call);
-
-            await call.setLayout(Layout.Spotlight);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.SpotlightLayout, {});
-
-            await call.setLayout(Layout.Tile);
-            expect(messaging.transport.send).toHaveBeenCalledWith(ElementWidgetActions.TileLayout, {});
-        });
-
         it("acknowledges mute_device widget action", async () => {
             await callConnectProcedure(call);
             const preventDefault = jest.fn();
@@ -1014,24 +979,6 @@ describe("ElementCall", () => {
             call.off(CallEvent.Participants, onParticipants);
         });
 
-        it("emits events when layout changes", async () => {
-            await callConnectProcedure(call);
-            const onLayout = jest.fn();
-            call.on(CallEvent.Layout, onLayout);
-
-            messaging.emit(
-                `action:${ElementWidgetActions.SpotlightLayout}`,
-                new CustomEvent("widgetapirequest", { detail: {} }),
-            );
-            messaging.emit(
-                `action:${ElementWidgetActions.TileLayout}`,
-                new CustomEvent("widgetapirequest", { detail: {} }),
-            );
-            expect(onLayout.mock.calls).toEqual([[Layout.Spotlight], [Layout.Tile]]);
-
-            call.off(CallEvent.Layout, onLayout);
-        });
-
         it("ends the call immediately if the session ended", async () => {
             await callConnectProcedure(call);
             const onDestroy = jest.fn();
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 5700fb4dd0..9abf48919c 100644
--- a/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap
+++ b/test/unit-tests/renderer/__snapshots__/link-tooltip-test.tsx.snap
@@ -14,7 +14,7 @@ exports[`link-tooltip wraps single anchor 1`] = `
     
                 
     <span
-      aria-labelledby=":r0:"
+      aria-labelledby="«r0»"
       tabindex="0"
     >
       <a
diff --git a/test/unit-tests/settings/SettingsStore-test.ts b/test/unit-tests/settings/SettingsStore-test.ts
index 03d45a9828..e2f7d845d2 100644
--- a/test/unit-tests/settings/SettingsStore-test.ts
+++ b/test/unit-tests/settings/SettingsStore-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
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import { ClientEvent, type MatrixClient, type Room, SyncState } from "matrix-js-sdk/src/matrix";
+import { waitFor } from "jest-matrix-react";
 
 import type BasePlatform from "../../../src/BasePlatform";
 import SdkConfig from "../../../src/SdkConfig";
@@ -14,6 +15,7 @@ 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 MatrixClientBackedController from "../../../src/settings/controllers/MatrixClientBackedController.ts";
 
 const TEST_DATA = [
     {
@@ -139,5 +141,61 @@ describe("SettingsStore", () => {
 
             expect(room.getAccountData).not.toHaveBeenCalled();
         });
+
+        describe("Migrate media preview configuration", () => {
+            beforeEach(() => {
+                MatrixClientBackedController.matrixClient = client;
+                client.getAccountData = jest.fn().mockImplementation((type) => {
+                    if (type === "im.vector.web.settings") {
+                        return {
+                            getContent: jest.fn().mockReturnValue({
+                                showImages: false,
+                                showAvatarsOnInvites: false,
+                            }),
+                        };
+                    } else {
+                        return undefined;
+                    }
+                });
+            });
+
+            it("migrates media preview configuration immediately", async () => {
+                client.setAccountData = jest.fn();
+                SettingsStore.runMigrations(false);
+                expect(client.setAccountData).toHaveBeenCalledWith("io.element.msc4278.media_preview_config", {
+                    invite_avatars: "off",
+                    media_previews: "off",
+                });
+            });
+            it("migrates media preview configuration once client is ready", async () => {
+                client.setAccountData = jest.fn();
+                const mockInitialSync = (client.isInitialSyncComplete = jest.fn().mockReturnValue(false));
+                SettingsStore.runMigrations(false);
+                mockInitialSync.mockReturnValue(true);
+                client.emit(ClientEvent.Sync, SyncState.Prepared, null);
+                // Update is asynchronous
+                waitFor(() => {
+                    expect(client.setAccountData).toHaveBeenCalledWith("io.element.msc4278.media_preview_config", {
+                        invite_avatars: "off",
+                        media_previews: "off",
+                    });
+                });
+            });
+
+            it("does not migrate media preview configuration if the session is fresh", async () => {
+                client.setAccountData = jest.fn();
+                SettingsStore.runMigrations(true);
+                client.emit(ClientEvent.Sync, SyncState.Prepared, null);
+                expect(client.setAccountData).not.toHaveBeenCalled();
+            });
+
+            it("does not migrate media preview configuration if the account data is already set", async () => {
+                client.setAccountData = jest.fn();
+                client.getAccountData = jest.fn().mockReturnValue({});
+                SettingsStore.runMigrations(false);
+                client.emit(ClientEvent.Sync, SyncState.Prepared, null);
+                expect(client.setAccountData).not.toHaveBeenCalled();
+            });
+        });
     });
 });
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/MediaPreviewConfigController-test.ts b/test/unit-tests/settings/controllers/MediaPreviewConfigController-test.ts
new file mode 100644
index 0000000000..ec93afb799
--- /dev/null
+++ b/test/unit-tests/settings/controllers/MediaPreviewConfigController-test.ts
@@ -0,0 +1,164 @@
+/*
+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 MediaPreviewConfigController from "../../../../src/settings/controllers/MediaPreviewConfigController";
+import { SettingLevel } from "../../../../src/settings/SettingLevel";
+import { getMockClientWithEventEmitter, mockClientMethodsServer } from "../../../test-utils";
+import { MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, MediaPreviewValue } from "../../../../src/@types/media_preview";
+
+describe("MediaPreviewConfigController", () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    const ROOM_ID = "!room:example.org";
+
+    it("gets the default settings when none are specified.", () => {
+        const controller = new MediaPreviewConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(null),
+        });
+
+        const value = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+        expect(value).toEqual(MediaPreviewConfigController.default);
+    });
+
+    it("gets the default settings when the setting is empty.", () => {
+        const controller = new MediaPreviewConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest
+                .fn()
+                .mockReturnValue(new MatrixEvent({ type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE, content: {} })),
+        });
+
+        const value = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+        expect(value).toEqual(MediaPreviewConfigController.default);
+    });
+
+    it.each([["media_previews"], ["invite_avatars"]])("gets the correct value for %s at the global level", (key) => {
+        const controller = new MediaPreviewConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(
+                new MatrixEvent({
+                    type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+                    content: {
+                        [key]: MediaPreviewValue.Off,
+                    },
+                }),
+            ),
+            getRoom: jest.fn().mockReturnValue({
+                getAccountData: jest.fn().mockReturnValue(null),
+            }),
+        });
+
+        const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+        expect(globalValue[key]).toEqual(MediaPreviewValue.Off);
+
+        // Should follow the global value.
+        const roomValue = controller.getValueOverride(SettingLevel.ROOM_ACCOUNT, ROOM_ID);
+        expect(roomValue[key]).toEqual(MediaPreviewValue.Off);
+    });
+
+    it.each([["media_previews"], ["invite_avatars"]])("gets the correct value for %s at the room level", (key) => {
+        const controller = new MediaPreviewConfigController();
+
+        MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
+            getAccountData: jest.fn().mockReturnValue(null),
+            getRoom: jest.fn().mockReturnValue({
+                getAccountData: jest.fn().mockReturnValue(
+                    new MatrixEvent({
+                        type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+                        content: {
+                            [key]: MediaPreviewValue.Off,
+                        },
+                    }),
+                ),
+            }),
+        });
+
+        const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+        expect(globalValue[key]).toEqual(MediaPreviewValue.On);
+
+        // Should follow the global value.
+        const roomValue = controller.getValueOverride(SettingLevel.ROOM_ACCOUNT, ROOM_ID);
+        expect(roomValue[key]).toEqual(MediaPreviewValue.Off);
+    });
+
+    it.each([["media_previews"], ["invite_avatars"]])(
+        "uses defaults when an invalid value is set on the global level",
+        (key) => {
+            const controller = new MediaPreviewConfigController();
+
+            MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+                ...mockClientMethodsServer(),
+                getAccountData: jest.fn().mockReturnValue(
+                    new MatrixEvent({
+                        type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+                        content: {
+                            [key]: "bibble",
+                        },
+                    }),
+                ),
+                getRoom: jest.fn().mockReturnValue({
+                    getAccountData: jest.fn().mockReturnValue(null),
+                }),
+            });
+
+            const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+            expect(globalValue[key]).toEqual(MediaPreviewValue.On);
+
+            // Should follow the global value.
+            const roomValue = controller.getValueOverride(SettingLevel.ROOM_ACCOUNT, ROOM_ID);
+            expect(roomValue[key]).toEqual(MediaPreviewValue.On);
+        },
+    );
+    it.each([["media_previews"], ["invite_avatars"]])(
+        "uses global value when an invalid value is set on the room level",
+        (key) => {
+            const controller = new MediaPreviewConfigController();
+
+            MatrixClientBackedController.matrixClient = getMockClientWithEventEmitter({
+                ...mockClientMethodsServer(),
+                getAccountData: jest.fn().mockReturnValue(
+                    new MatrixEvent({
+                        type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+                        content: {
+                            [key]: MediaPreviewValue.Off,
+                        },
+                    }),
+                ),
+                getRoom: jest.fn().mockReturnValue({
+                    getAccountData: jest.fn().mockReturnValue(
+                        new MatrixEvent({
+                            type: MEDIA_PREVIEW_ACCOUNT_DATA_TYPE,
+                            content: {
+                                [key]: "bibble",
+                            },
+                        }),
+                    ),
+                }),
+            });
+
+            const globalValue = controller.getValueOverride(SettingLevel.ACCOUNT, null);
+            expect(globalValue[key]).toEqual(MediaPreviewValue.Off);
+
+            // Should follow the global value.
+            const roomValue = controller.getValueOverride(SettingLevel.ROOM_ACCOUNT, ROOM_ID);
+            expect(roomValue[key]).toEqual(MediaPreviewValue.Off);
+        },
+    );
+});
diff --git a/test/unit-tests/settings/controllers/ServerSupportUnstableFeatureController-test.ts b/test/unit-tests/settings/controllers/ServerSupportUnstableFeatureController-test.ts
index fe96ca448b..cab82f8d32 100644
--- a/test/unit-tests/settings/controllers/ServerSupportUnstableFeatureController-test.ts
+++ b/test/unit-tests/settings/controllers/ServerSupportUnstableFeatureController-test.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 { defer } from "matrix-js-sdk/src/utils";
 import { type MatrixClient } from "matrix-js-sdk/src/matrix";
 
 import ServerSupportUnstableFeatureController from "../../../../src/settings/controllers/ServerSupportUnstableFeatureController";
@@ -34,7 +33,7 @@ describe("ServerSupportUnstableFeatureController", () => {
             controller,
         };
 
-        const deferred = defer<any>();
+        const deferred = Promise.withResolvers<any>();
         watchers.watchSetting(setting, null, deferred.resolve);
         MatrixClientBackedController.matrixClient = cli;
         await deferred.promise;
diff --git a/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx b/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
index 7b02225cd6..a902616673 100644
--- a/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
+++ b/test/unit-tests/stores/ReleaseAnnouncementStore-test.tsx
@@ -85,7 +85,8 @@ describe("ReleaseAnnouncementStore", () => {
         expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBeNull();
     });
 
-    it("should return the next feature when the next release announcement is called", async () => {
+    // We only have a single release announcement currently
+    it.skip("should return the next feature when the next release announcement is called", async () => {
         // Sanity check
         expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("threadsActivityCentre");
 
@@ -109,12 +110,12 @@ describe("ReleaseAnnouncementStore", () => {
 
     it("should listen to release announcement data changes in the store", async () => {
         const secondStore = new ReleaseAnnouncementStore();
-        expect(secondStore.getReleaseAnnouncement()).toBe("threadsActivityCentre");
+        expect(secondStore.getReleaseAnnouncement()).toBe("pinningMessageList");
 
         const promise = listenReleaseAnnouncementChanged();
         await secondStore.nextReleaseAnnouncement();
 
-        expect(await promise).toBe("pinningMessageList");
-        expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe("pinningMessageList");
+        expect(await promise).toBe(null);
+        expect(releaseAnnouncementStore.getReleaseAnnouncement()).toBe(null);
     });
 });
diff --git a/test/unit-tests/stores/SetupEncryptionStore-test.ts b/test/unit-tests/stores/SetupEncryptionStore-test.ts
index c30f0e38ec..468a6439ee 100644
--- a/test/unit-tests/stores/SetupEncryptionStore-test.ts
+++ b/test/unit-tests/stores/SetupEncryptionStore-test.ts
@@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details.
 import { mocked, type Mocked } from "jest-mock";
 import { type MatrixClient, Device } from "matrix-js-sdk/src/matrix";
 import { type SecretStorageKeyDescriptionAesV1, type ServerSideSecretStorage } from "matrix-js-sdk/src/secret-storage";
-import { type BootstrapCrossSigningOpts, type CryptoApi, DeviceVerificationStatus } from "matrix-js-sdk/src/crypto-api";
+import { type CryptoApi, DeviceVerificationStatus } from "matrix-js-sdk/src/crypto-api";
 
 import { accessSecretStorage } from "../../../src/SecurityManager";
 import { SetupEncryptionStore } from "../../../src/stores/SetupEncryptionStore";
@@ -152,21 +152,4 @@ describe("SetupEncryptionStore", () => {
             await dehydrationPromise;
         });
     });
-
-    it("resetConfirm should work with a cached account password", async () => {
-        const makeRequest = jest.fn();
-        mockCrypto.bootstrapCrossSigning.mockImplementation(async (opts: BootstrapCrossSigningOpts) => {
-            await opts?.authUploadDeviceSigningKeys?.(makeRequest);
-        });
-        mocked(accessSecretStorage).mockImplementation(async (func?: () => Promise<void>) => {
-            await func!();
-        });
-
-        await setupEncryptionStore.resetConfirm();
-
-        expect(mocked(accessSecretStorage)).toHaveBeenCalledWith(expect.any(Function), {
-            forceReset: true,
-            resetCrossSigning: true,
-        });
-    });
 });
diff --git a/test/unit-tests/stores/SpaceStore-test.ts b/test/unit-tests/stores/SpaceStore-test.ts
index 7471ae118b..6b6b6c1bc1 100644
--- a/test/unit-tests/stores/SpaceStore-test.ts
+++ b/test/unit-tests/stores/SpaceStore-test.ts
@@ -20,7 +20,6 @@ import {
     type RoomState,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
-import { defer } from "matrix-js-sdk/src/utils";
 
 import SpaceStore from "../../../src/stores/spaces/SpaceStore";
 import {
@@ -1010,7 +1009,7 @@ describe("SpaceStore", () => {
 
         await run();
 
-        const deferred = defer<boolean>();
+        const deferred = Promise.withResolvers<boolean>();
         space.loadMembersIfNeeded.mockImplementation(() => {
             const event = mkEvent({
                 event: true,
diff --git a/test/unit-tests/stores/notifications/RoomNotificationState-test.ts b/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
index f9ed754c17..91d13809ec 100644
--- a/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
+++ b/test/unit-tests/stores/notifications/RoomNotificationState-test.ts
@@ -223,7 +223,7 @@ describe("RoomNotificationState", () => {
         it("should has isUnsetMessage at true", () => {
             jest.spyOn(RoomStatusBarModule, "getUnsentMessages").mockReturnValue([{} as MatrixEvent]);
             const roomNotifState = new RoomNotificationState(room, false);
-            expect(roomNotifState.isUnsetMessage).toBe(true);
+            expect(roomNotifState.isUnsentMessage).toBe(true);
         });
 
         it("should has isMention at false if the notification is invitation, an unset message or a knock", () => {
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 73fb72ea17..47b48d437b 100644
--- a/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
+++ b/test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
@@ -10,13 +10,12 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import type { MatrixClient } from "matrix-js-sdk/src/matrix";
 import type { RoomNotificationState } from "../../../../src/stores/notifications/RoomNotificationState";
-import { RoomListStoreV3Class } from "../../../../src/stores/room-list-v3/RoomListStoreV3";
+import { LISTS_UPDATE_EVENT, RoomListStoreV3Class } from "../../../../src/stores/room-list-v3/RoomListStoreV3";
 import { AsyncStoreWithClient } from "../../../../src/stores/AsyncStoreWithClient";
 import { RecencySorter } from "../../../../src/stores/room-list-v3/skip-list/sorters/RecencySorter";
-import { mkEvent, mkMessage, mkSpace, stubClient, upsertRoomStateEvents } from "../../../test-utils";
+import { mkEvent, mkMessage, mkSpace, mkStubRoom, stubClient, upsertRoomStateEvents } from "../../../test-utils";
 import { getMockedRooms } from "./skip-list/getMockedRooms";
 import { AlphabeticSorter } from "../../../../src/stores/room-list-v3/skip-list/sorters/AlphabeticSorter";
-import { LISTS_UPDATE_EVENT } from "../../../../src/stores/room-list/RoomListStore";
 import dispatcher from "../../../../src/dispatcher/dispatcher";
 import SpaceStore from "../../../../src/stores/spaces/SpaceStore";
 import { MetaSpace, UPDATE_SELECTED_SPACE } from "../../../../src/stores/spaces";
@@ -27,6 +26,8 @@ import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import { SortingAlgorithm } from "../../../../src/stores/room-list-v3/skip-list/sorters";
 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";
 
 describe("RoomListStoreV3", () => {
     async function getRoomListStore() {
@@ -121,12 +122,60 @@ describe("RoomListStoreV3", () => {
             expect(store.getSortedRooms()[0].roomId).toEqual(room.roomId);
         });
 
-        it("Room is removed when membership changes from join to leave", async () => {
+        it("Forgotten room is removed", async () => {
             const { store, rooms, dispatcher } = await getRoomListStore();
-
-            // Let's say the user leaves room at index 37
             const room = rooms[37];
 
+            // Room at index 37 should be in the store now
+            expect(store.getSortedRooms().map((r) => r.roomId)).toContain(room.roomId);
+
+            // Forget room at index 37
+            const payload = {
+                action: Action.AfterForgetRoom,
+                room: room,
+            };
+            const fn = jest.fn();
+            store.on(LISTS_UPDATE_EVENT, fn);
+            dispatcher.dispatch(payload, true);
+
+            // Room at index 37 should no longer be in the store
+            expect(fn).toHaveBeenCalled();
+            expect(store.getSortedRooms().map((r) => r.roomId)).not.toContain(room.roomId);
+        });
+
+        it.each([KnownMembership.Join, KnownMembership.Invite])(
+            "Room is removed when membership changes to leave",
+            async (membership) => {
+                const { store, rooms, dispatcher } = await getRoomListStore();
+
+                // Let's say the user leaves room at index 37
+                const room = rooms[37];
+
+                const payload = {
+                    action: "MatrixActions.Room.myMembership",
+                    oldMembership: membership,
+                    membership: KnownMembership.Leave,
+                    room,
+                };
+
+                const fn = jest.fn();
+                store.on(LISTS_UPDATE_EVENT, fn);
+                dispatcher.dispatch(payload, true);
+
+                expect(fn).toHaveBeenCalled();
+                expect(store.getSortedRooms()).not.toContain(room);
+            },
+        );
+
+        it("Room is not removed when user is kicked", async () => {
+            const { store, rooms, dispatcher, client } = await getRoomListStore();
+
+            // Let's say the user gets kicked out of room at index 37
+            const room = rooms[37];
+            const mockMember = room.getMember(client.getSafeUserId())!;
+            mockMember.isKicked = () => true;
+            room.getMember = () => mockMember;
+
             const payload = {
                 action: "MatrixActions.Room.myMembership",
                 oldMembership: KnownMembership.Join,
@@ -139,7 +188,7 @@ describe("RoomListStoreV3", () => {
             dispatcher.dispatch(payload, true);
 
             expect(fn).toHaveBeenCalled();
-            expect(store.getSortedRooms()).not.toContain(room);
+            expect(store.getSortedRooms()).toContain(room);
         });
 
         it("Predecessor room is removed on room upgrade", async () => {
@@ -178,14 +227,17 @@ describe("RoomListStoreV3", () => {
             expect(roomIds).toContain(newRoom.roomId);
         });
 
-        it("Rooms are inserted on m.direct event", async () => {
-            const { store, dispatcher } = await getRoomListStore();
+        it("Rooms are re-inserted on m.direct event", async () => {
+            const { store, dispatcher, client } = await getRoomListStore();
+
+            // Let's mock the client to return new rooms with the name "My DM Room"
+            client.getRoom = (roomId: string) => mkStubRoom(roomId, "My DM Room", client);
 
             // Let's create a m.direct event that we can dispatch
             const content = {
-                "@bar1:matrix.org": ["!newroom1:matrix.org", "!newroom2:matrix.org"],
-                "@bar2:matrix.org": ["!newroom3:matrix.org", "!newroom4:matrix.org"],
-                "@bar3:matrix.org": ["!newroom5:matrix.org"],
+                "@bar1:matrix.org": ["!foo1:matrix.org", "!foo2:matrix.org"],
+                "@bar2:matrix.org": ["!foo3:matrix.org", "!foo4:matrix.org"],
+                "@bar3:matrix.org": ["!foo5:matrix.org"],
             };
             const event = mkEvent({
                 event: true,
@@ -196,6 +248,8 @@ describe("RoomListStoreV3", () => {
 
             const fn = jest.fn();
             store.on(LISTS_UPDATE_EVENT, fn);
+
+            // Do the actual dispatch
             dispatcher.dispatch(
                 {
                     action: "MatrixActions.accountData",
@@ -208,17 +262,21 @@ describe("RoomListStoreV3", () => {
             // Ensure only one emit occurs
             expect(fn).toHaveBeenCalledTimes(1);
 
-            // Each of these rooms should now appear in the store
-            // We don't need to mock the rooms themselves since our mocked
-            // client will create the rooms on getRoom() call.
-            const roomIds = store.getSortedRooms().map((r) => r.roomId);
-            [
-                "!newroom1:matrix.org",
-                "!newroom2:matrix.org",
-                "!newroom3:matrix.org",
-                "!newroom4:matrix.org",
-                "!newroom5:matrix.org",
-            ].forEach((id) => expect(roomIds).toContain(id));
+            /*
+             When the dispatched event is processed by the room-list, the associated
+             rooms will be fetched via client.getRoom and will be re-inserted into the
+             skip list. We can confirm that this happened by checking if all the dm rooms
+             have the same name ("My DM Room") since we've mocked the client to return such rooms.
+             */
+            const ids = [
+                "!foo1:matrix.org",
+                "!foo2:matrix.org",
+                "!foo3:matrix.org",
+                "!foo4:matrix.org",
+                "!foo5:matrix.org",
+            ];
+            const rooms = store.getSortedRooms().filter((r) => ids.includes(r.roomId));
+            rooms.forEach((room) => expect(room.name).toBe("My DM Room"));
         });
 
         it("Room is re-inserted on tag change", async () => {
@@ -358,6 +416,32 @@ describe("RoomListStoreV3", () => {
         }
 
         describe("Spaces", () => {
+            it("Newly created space is not added by the store", async () => {
+                const { client, rooms } = getClientAndRooms();
+                const infoSpy = jest.spyOn(logger, "info");
+
+                const store = new RoomListStoreV3Class(dispatcher);
+                await store.start();
+
+                // Create a space and let the store know about it
+                const { spaceRoom } = createSpace(rooms, [6, 8, 13, 27, 75], client);
+                dispatcher.dispatch(
+                    {
+                        action: "MatrixActions.Room.myMembership",
+                        oldMembership: KnownMembership.Leave,
+                        membership: KnownMembership.Invite,
+                        room: spaceRoom,
+                    },
+                    true,
+                );
+
+                // Space room should not be added
+                expect(store.getSortedRooms()).not.toContain(spaceRoom);
+                expect(infoSpy).toHaveBeenCalledWith(
+                    expect.stringContaining("RoomListStoreV3: Refusing to add new room"),
+                );
+            });
+
             it("Filtering by spaces work", async () => {
                 const { client, rooms } = getClientAndRooms();
                 // Let's choose 5 rooms to put in space
@@ -569,7 +653,7 @@ describe("RoomListStoreV3", () => {
                 // Let's say 8, 27 have mentions
                 jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockImplementation((room) => {
                     const state = {
-                        hasMentions: [rooms[8], rooms[27]].includes(room),
+                        isMention: [rooms[8], rooms[27]].includes(room),
                     } as unknown as RoomNotificationState;
                     return state;
                 });
@@ -635,4 +719,132 @@ describe("RoomListStoreV3", () => {
             });
         });
     });
+
+    describe("Muted rooms", () => {
+        async function getRoomListStoreWithMutedRooms() {
+            const client = stubClient();
+            const rooms = getMockedRooms(client);
+
+            // Let's say that rooms 34, 84, 64, 14, 57 are muted
+            const mutedIndices = [34, 84, 64, 14, 57];
+            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();
+            return { client, rooms, mutedIndices, mutedRooms, store, dispatcher };
+        }
+
+        it("Muted rooms are sorted to the bottom of the list", async () => {
+            const { store, mutedRooms, client } = await getRoomListStoreWithMutedRooms();
+            const lastFiveRooms = store.getSortedRooms().slice(95);
+            const expectedRooms = new RecencySorter(client.getSafeUserId()).sort(mutedRooms);
+            // We expect the muted rooms to be at the bottom sorted by recency
+            expect(lastFiveRooms).toEqual(expectedRooms);
+        });
+
+        it("Muted rooms are sorted within themselves", async () => {
+            const { store, rooms } = await getRoomListStoreWithMutedRooms();
+
+            // Let's say that rooms 14 and 34 get new messages in that order
+            let ts = 1000;
+            for (const room of [rooms[14], rooms[34]]) {
+                const event = mkMessage({ room: room.roomId, user: `@foo${3}:matrix.org`, ts: 1000, event: true });
+                room.timeline.push(event);
+
+                const payload = {
+                    action: "MatrixActions.Room.timeline",
+                    event,
+                    isLiveEvent: true,
+                    isLiveUnfilteredRoomTimelineEvent: true,
+                    room,
+                };
+                dispatcher.dispatch(payload, true);
+                ts = ts + 1;
+            }
+
+            const lastFiveRooms = store.getSortedRooms().slice(95);
+            // The order previously would  have been 84, 64, 57, 34, 14
+            // Expected new order is 34, 14, 84, 64, 57
+            const expectedRooms = [rooms[34], rooms[14], rooms[84], rooms[64], rooms[57]];
+            expect(lastFiveRooms).toEqual(expectedRooms);
+        });
+
+        it("Muted room is correctly sorted when unmuted", async () => {
+            const { store, mutedRooms, rooms, client } = await getRoomListStoreWithMutedRooms();
+
+            // Let's say that muted room 64 becomes un-muted.
+            const unmutedRoom = rooms[64];
+            jest.spyOn(roomMute, "getChangedOverrideRoomMutePushRules").mockImplementation(() => [unmutedRoom.roomId]);
+            client.getRoom = jest.fn().mockReturnValue(unmutedRoom);
+            const payload = {
+                action: "MatrixActions.accountData",
+                event_type: EventType.PushRules,
+            };
+            mutedRooms.splice(2, 1);
+            dispatcher.dispatch(payload, true);
+
+            const lastFiveRooms = store.getSortedRooms().slice(95);
+            // We expect room at index 64 to no longer be at the bottom
+            expect(lastFiveRooms).not.toContain(unmutedRoom);
+            // Room 64 should go to index 34 since we're sorting by recency
+            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-v3/skip-list/RoomSkipList-test.ts b/test/unit-tests/stores/room-list-v3/skip-list/RoomSkipList-test.ts
index 1d091350b1..671bfface8 100644
--- a/test/unit-tests/stores/room-list-v3/skip-list/RoomSkipList-test.ts
+++ b/test/unit-tests/stores/room-list-v3/skip-list/RoomSkipList-test.ts
@@ -9,6 +9,7 @@ import { shuffle } from "lodash";
 
 import type { Room } from "matrix-js-sdk/src/matrix";
 import type { Sorter } from "../../../../../src/stores/room-list-v3/skip-list/sorters";
+import type { RoomNotificationState } from "../../../../../src/stores/notifications/RoomNotificationState";
 import { mkMessage, stubClient } from "../../../../test-utils";
 import { RoomSkipList } from "../../../../../src/stores/room-list-v3/skip-list/RoomSkipList";
 import { RecencySorter } from "../../../../../src/stores/room-list-v3/skip-list/sorters/RecencySorter";
@@ -16,6 +17,7 @@ import { AlphabeticSorter } from "../../../../../src/stores/room-list-v3/skip-li
 import { getMockedRooms } from "./getMockedRooms";
 import SpaceStore from "../../../../../src/stores/spaces/SpaceStore";
 import { MetaSpace } from "../../../../../src/stores/spaces";
+import { RoomNotificationStateStore } from "../../../../../src/stores/notifications/RoomNotificationStateStore";
 
 describe("RoomSkipList", () => {
     function generateSkipList(roomCount?: number): {
@@ -36,6 +38,12 @@ describe("RoomSkipList", () => {
         jest.spyOn(SpaceStore.instance, "isRoomInSpace").mockImplementation((space) => space === MetaSpace.Home);
         jest.spyOn(SpaceStore.instance, "activeSpace", "get").mockImplementation(() => MetaSpace.Home);
         jest.spyOn(SpaceStore.instance, "storeReadyPromise", "get").mockImplementation(() => Promise.resolve());
+        jest.spyOn(RoomNotificationStateStore.instance, "getRoomState").mockImplementation(() => {
+            const state = {
+                mute: false,
+            } as unknown as RoomNotificationState;
+            return state;
+        });
     });
 
     it("Rooms are in sorted order after initial seed", () => {
@@ -54,7 +62,7 @@ describe("RoomSkipList", () => {
         for (const room of toInsert) {
             // Insert this room 10 times
             for (let i = 0; i < 10; ++i) {
-                skipList.addRoom(room);
+                skipList.reInsertRoom(room);
             }
         }
         // Sorting order should be the same as before
@@ -76,7 +84,7 @@ describe("RoomSkipList", () => {
                 event: true,
             });
             room.timeline.push(event);
-            skipList.addRoom(room);
+            skipList.reInsertRoom(room);
             expect(skipList.size).toEqual(rooms.length);
         }
         const sortedRooms = [...skipList];
@@ -85,6 +93,12 @@ describe("RoomSkipList", () => {
         }
     });
 
+    it("Throws error when same room is added via addNewRoom", () => {
+        const { skipList, rooms } = generateSkipList();
+        const room = rooms[5];
+        expect(() => skipList.addNewRoom(room)).toThrow("Can't add room to skiplist");
+    });
+
     it("Re-sort works when sorter is swapped", () => {
         const { skipList, rooms, sorter } = generateSkipList();
         const sortedByRecency = [...rooms].sort((a, b) => sorter.comparator(a, b));
@@ -112,7 +126,7 @@ describe("RoomSkipList", () => {
 
             // Shuffle and insert the rooms
             for (const room of shuffle(rooms)) {
-                roomSkipList.addRoom(room);
+                roomSkipList.addNewRoom(room);
             }
 
             expect(roomSkipList.size).toEqual(totalRooms);
diff --git a/test/unit-tests/stores/room-list/filters/VisibilityProvider-test.ts b/test/unit-tests/stores/room-list/filters/VisibilityProvider-test.ts
index 3ba1fb3de6..95e0a3e103 100644
--- a/test/unit-tests/stores/room-list/filters/VisibilityProvider-test.ts
+++ b/test/unit-tests/stores/room-list/filters/VisibilityProvider-test.ts
@@ -10,22 +10,10 @@ import { mocked } from "jest-mock";
 import { type Room, RoomType } from "matrix-js-sdk/src/matrix";
 
 import { VisibilityProvider } from "../../../../../src/stores/room-list/filters/VisibilityProvider";
-import LegacyCallHandler from "../../../../../src/LegacyCallHandler";
-import VoipUserMapper from "../../../../../src/VoipUserMapper";
 import { LocalRoom, LOCAL_ROOM_ID_PREFIX } from "../../../../../src/models/LocalRoom";
 import { RoomListCustomisations } from "../../../../../src/customisations/RoomList";
 import { createTestClient } from "../../../../test-utils";
 
-jest.mock("../../../../../src/VoipUserMapper", () => ({
-    sharedInstance: jest.fn(),
-}));
-
-jest.mock("../../../../../src/LegacyCallHandler", () => ({
-    instance: {
-        getSupportsVirtualRooms: jest.fn(),
-    },
-}));
-
 jest.mock("../../../../../src/customisations/RoomList", () => ({
     RoomListCustomisations: {
         isRoomVisible: jest.fn(),
@@ -46,16 +34,6 @@ const createLocalRoom = (): LocalRoom => {
 };
 
 describe("VisibilityProvider", () => {
-    let mockVoipUserMapper: VoipUserMapper;
-
-    beforeEach(() => {
-        mockVoipUserMapper = {
-            onNewInvitedRoom: jest.fn(),
-            isVirtualRoom: jest.fn(),
-        } as unknown as VoipUserMapper;
-        mocked(VoipUserMapper.sharedInstance).mockReturnValue(mockVoipUserMapper);
-    });
-
     describe("instance", () => {
         it("should return an instance", () => {
             const visibilityProvider = VisibilityProvider.instance;
@@ -64,28 +42,7 @@ describe("VisibilityProvider", () => {
         });
     });
 
-    describe("onNewInvitedRoom", () => {
-        it("should call onNewInvitedRoom on VoipUserMapper.sharedInstance", async () => {
-            const room = {} as unknown as Room;
-            await VisibilityProvider.instance.onNewInvitedRoom(room);
-            expect(mockVoipUserMapper.onNewInvitedRoom).toHaveBeenCalledWith(room);
-        });
-    });
-
     describe("isRoomVisible", () => {
-        describe("for a virtual room", () => {
-            beforeEach(() => {
-                mocked(LegacyCallHandler.instance.getSupportsVirtualRooms).mockReturnValue(true);
-                mocked(mockVoipUserMapper.isVirtualRoom).mockReturnValue(true);
-            });
-
-            it("should return return false", () => {
-                const room = createRoom();
-                expect(VisibilityProvider.instance.isRoomVisible(room)).toBe(false);
-                expect(mockVoipUserMapper.isVirtualRoom).toHaveBeenCalledWith(room);
-            });
-        });
-
         it("should return false without room", () => {
             expect(VisibilityProvider.instance.isRoomVisible()).toBe(false);
         });
diff --git a/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts b/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts
index 04f0ec1404..e08a83dd02 100644
--- a/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts
+++ b/test/unit-tests/stores/widgets/StopGapWidgetDriver-test.ts
@@ -708,6 +708,7 @@ describe("StopGapWidgetDriver", () => {
             id: "$event-id2",
             type: "org.example.foo",
             user: "@alice:example.org",
+            skey: "",
             content: { hello: "world" },
             room: "!1:example.org",
         });
@@ -726,6 +727,12 @@ describe("StopGapWidgetDriver", () => {
             ).toEqual([event2, event1].map((e) => e.getEffectiveEvent()));
         });
 
+        it("reads state events", async () => {
+            expect(
+                await driver.readRoomTimeline("!1:example.org", "org.example.foo", undefined, "", 10, undefined),
+            ).toEqual([event2.getEffectiveEvent()]);
+        });
+
         it("reads up to a limit", async () => {
             expect(
                 await driver.readRoomTimeline("!1:example.org", "org.example.foo", undefined, undefined, 1, undefined),
diff --git a/test/unit-tests/theme-test.ts b/test/unit-tests/theme-test.ts
index 6c2f247e4e..b9c7e9341c 100644
--- a/test/unit-tests/theme-test.ts
+++ b/test/unit-tests/theme-test.ts
@@ -135,6 +135,54 @@ describe("theme", () => {
             expect(spy.mock.calls[0][0].textContent).toMatchSnapshot();
             spy.mockRestore();
         });
+
+        it("should handle 4-char rgba hex strings", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockReturnValue([
+                {
+                    name: "blue",
+                    colors: {
+                        "sidebar-color": "#abcd",
+                    },
+                },
+            ]);
+
+            const spy = jest.fn();
+            jest.spyOn(document.body, "style", "get").mockReturnValue({
+                setProperty: spy,
+            } as any);
+            await new Promise((resolve) => {
+                setTheme("custom-blue").then(resolve);
+                lightCustomTheme.onload!({} as Event);
+            });
+            expect(spy).toHaveBeenCalledWith("--sidebar-color", "#abcd");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-0pct", "#aabbcc00");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-15pct", "#aabbcc21");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-50pct", "#aabbcc6f");
+        });
+
+        it("should handle 6-char rgb hex strings", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockReturnValue([
+                {
+                    name: "blue",
+                    colors: {
+                        "sidebar-color": "#abcdef",
+                    },
+                },
+            ]);
+
+            const spy = jest.fn();
+            jest.spyOn(document.body, "style", "get").mockReturnValue({
+                setProperty: spy,
+            } as any);
+            await new Promise((resolve) => {
+                setTheme("custom-blue").then(resolve);
+                lightCustomTheme.onload!({} as Event);
+            });
+            expect(spy).toHaveBeenCalledWith("--sidebar-color", "#abcdef");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-0pct", "#abcdef00");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-15pct", "#abcdef26");
+            expect(spy).toHaveBeenCalledWith("--sidebar-color-50pct", "#abcdef80");
+        });
     });
 
     describe("enumerateThemes", () => {
diff --git a/test/unit-tests/toasts/SetupEncryptionToast-test.tsx b/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
index 252d8d2d60..eb584aafd9 100644
--- a/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
+++ b/test/unit-tests/toasts/SetupEncryptionToast-test.tsx
@@ -9,10 +9,13 @@ import React from "react";
 import { render, screen } from "jest-matrix-react";
 import userEvent from "@testing-library/user-event";
 
+import * as SecurityManager from "../../../src/SecurityManager";
 import ToastContainer from "../../../src/components/structures/ToastContainer";
 import { Kind, 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";
 
 jest.mock("../../../src/dispatcher/dispatcher", () => ({
     dispatch: jest.fn(),
@@ -22,42 +25,115 @@ jest.mock("../../../src/dispatcher/dispatcher", () => ({
 
 describe("SetupEncryptionToast", () => {
     beforeEach(() => {
+        jest.resetAllMocks();
         render(<ToastContainer />);
     });
 
-    it("should render the 'set up recovery' toast", async () => {
-        showToast(Kind.SET_UP_RECOVERY);
+    describe("Set up recovery", () => {
+        it("should render the toast", async () => {
+            showToast(Kind.SET_UP_RECOVERY);
 
-        await expect(await screen.findByRole("heading", { name: "Set up recovery" })).toBeInTheDocument();
+            expect(await screen.findByRole("heading", { name: "Set up recovery" })).toBeInTheDocument();
+        });
+
+        it("should dismiss the toast when 'not now' button clicked", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "dismissEncryptionSetup");
+
+            showToast(Kind.SET_UP_RECOVERY);
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByRole("button", { name: "Not now" }));
+
+            expect(DeviceListener.sharedInstance().dismissEncryptionSetup).toHaveBeenCalled();
+        });
     });
 
-    it("should dismiss toast when 'not now' button clicked", async () => {
-        jest.spyOn(DeviceListener.sharedInstance(), "dismissEncryptionSetup");
+    describe("Key storage out of sync", () => {
+        it("should render the toast", async () => {
+            showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
 
-        showToast(Kind.SET_UP_RECOVERY);
+            await expect(screen.findByText("Your key storage is out of sync.")).resolves.toBeInTheDocument();
+        });
 
-        const user = userEvent.setup();
-        await user.click(await screen.findByRole("button", { name: "Not now" }));
+        it("should open settings to the reset flow when 'forgot recovery key' clicked", async () => {
+            showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
 
-        expect(DeviceListener.sharedInstance().dismissEncryptionSetup).toHaveBeenCalled();
+            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: "reset_identity_forgot" },
+            });
+        });
+
+        it("should open settings to the reset flow when recovering fails", async () => {
+            jest.spyOn(SecurityManager, "accessSecretStorage").mockImplementation(async () => {
+                throw new Error("Something went wrong while recovering!");
+            });
+
+            showToast(Kind.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: "reset_identity_sync_failed" },
+            });
+        });
     });
 
-    it("should render the 'key storage out of sync' toast", async () => {
-        showToast(Kind.KEY_STORAGE_OUT_OF_SYNC);
+    describe("Turn on key storage", () => {
+        it("should render the toast", async () => {
+            showToast(Kind.TURN_ON_KEY_STORAGE);
 
-        await expect(screen.findByText("Your key storage is out of sync.")).resolves.toBeInTheDocument();
-    });
+            await expect(screen.findByText("Turn on key storage")).resolves.toBeInTheDocument();
+            await expect(screen.findByRole("button", { name: "Dismiss" })).resolves.toBeInTheDocument();
+            await expect(screen.findByRole("button", { name: "Continue" })).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 open settings to the Encryption tab when 'Continue' clicked", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "recordKeyBackupDisabled");
 
-        const user = userEvent.setup();
-        await user.click(await screen.findByText("Forgot recovery key?"));
+            showToast(Kind.TURN_ON_KEY_STORAGE);
 
-        expect(dis.dispatch).toHaveBeenCalledWith({
-            action: "view_user_settings",
-            initialTabId: "USER_ENCRYPTION_TAB",
-            props: { showResetIdentity: true },
+            const user = userEvent.setup();
+            await user.click(await screen.findByRole("button", { name: "Continue" }));
+
+            expect(dis.dispatch).toHaveBeenCalledWith({
+                action: "view_user_settings",
+                initialTabId: "USER_ENCRYPTION_TAB",
+            });
+
+            expect(DeviceListener.sharedInstance().recordKeyBackupDisabled).not.toHaveBeenCalled();
+        });
+
+        it("should open the confirm key storage off dialog when 'Dismiss' clicked", async () => {
+            jest.spyOn(DeviceListener.sharedInstance(), "recordKeyBackupDisabled");
+
+            // Given that as soon as the dialog opens, it closes and says "yes they clicked dismiss"
+            jest.spyOn(Modal, "createDialog").mockImplementation(() => {
+                return { finished: Promise.resolve([true]) } as any;
+            });
+
+            // When we show the toast, and click Dismiss
+            showToast(Kind.TURN_ON_KEY_STORAGE);
+
+            const user = userEvent.setup();
+            await user.click(await screen.findByRole("button", { name: "Dismiss" }));
+
+            // Then the dialog was opened
+            expect(Modal.createDialog).toHaveBeenCalledWith(
+                ConfirmKeyStorageOffDialog,
+                undefined,
+                "mx_ConfirmKeyStorageOffDialog",
+            );
+
+            // And the backup was disabled when the dialog's onFinished was called
+            expect(DeviceListener.sharedInstance().recordKeyBackupDisabled).toHaveBeenCalledTimes(1);
         });
     });
 });
diff --git a/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap b/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
index 32f0ec443c..464963c1ef 100644
--- a/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
+++ b/test/unit-tests/utils/__snapshots__/FormattingUtils-test.tsx.snap
@@ -1,48 +1,72 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FormattingUtils formatList should return expected sentence in ReactNode when given 2 React children 1`] = `
-<span>
-  <span>
-    a
-  </span>
-   and 
-  <span>
-    b
-  </span>
-</span>
+<React.Fragment>
+  <React.Fragment>
+    <span>
+      a
+    </span>
+  </React.Fragment>
+  <React.Fragment>
+     and 
+  </React.Fragment>
+  <React.Fragment>
+    <span>
+      b
+    </span>
+  </React.Fragment>
+</React.Fragment>
 `;
 
 exports[`FormattingUtils formatList should return expected sentence in ReactNode when given more React children 1`] = `
-<span>
-  <span>
-    a
-  </span>
-  , 
-  <span>
-    b
-  </span>
-  , 
-  <span>
-    c
-  </span>
-   and 
-  <span>
-    d
-  </span>
-</span>
+<React.Fragment>
+  <React.Fragment>
+    <span>
+      a
+    </span>
+  </React.Fragment>
+  <React.Fragment>
+    , 
+  </React.Fragment>
+  <React.Fragment>
+    <span>
+      b
+    </span>
+  </React.Fragment>
+  <React.Fragment>
+    , 
+  </React.Fragment>
+  <React.Fragment>
+    <span>
+      c
+    </span>
+  </React.Fragment>
+  <React.Fragment>
+     and 
+  </React.Fragment>
+  <React.Fragment>
+    <span>
+      d
+    </span>
+  </React.Fragment>
+</React.Fragment>
 `;
 
 exports[`FormattingUtils formatList should return expected sentence in ReactNode when using itemLimit 1`] = `
 <span>
-  <span>
-    <span>
-      a
-    </span>
-    , 
-    <span>
-      b
-    </span>
-  </span>
+  <React.Fragment>
+    <React.Fragment>
+      <span>
+        a
+      </span>
+      , 
+    </React.Fragment>
+    <React.Fragment>
+      <span>
+        b
+      </span>
+    </React.Fragment>
+  </React.Fragment>
    and 2 others
 </span>
 `;
diff --git a/test/unit-tests/utils/export-test.tsx b/test/unit-tests/utils/export-test.tsx
index bd0c13e05c..a5e0063f3b 100644
--- a/test/unit-tests/utils/export-test.tsx
+++ b/test/unit-tests/utils/export-test.tsx
@@ -253,8 +253,9 @@ describe("export", function () {
             },
             setProgressText,
         );
-        const imageRegex = /<img.+ src="mxc:\/\/test.org" alt="image\.png"\/?>/;
-        expect(imageRegex.test(renderToString(exporter.getEventTile(mkImageEvent(), true)))).toBeTruthy();
+        expect(renderToString(exporter.getEventTile(mkImageEvent(), true))).toMatch(
+            /<img.+ alt="image\.png" src="mxc:\/\/test.org"\/?>/,
+        );
     });
 
     const invalidExportOptions: [string, IExportOptions][] = [
diff --git a/test/unit-tests/utils/exportUtils/HTMLExport-test.ts b/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
index 6415efaf1d..91c4c3febd 100644
--- a/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
+++ b/test/unit-tests/utils/exportUtils/HTMLExport-test.ts
@@ -104,8 +104,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 +419,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";
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 83ffc13e78..56cc1d0f27 100644
--- a/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
+++ b/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
@@ -57,7 +57,7 @@ exports[`HTMLExport should export 1`] = `
                                             <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 🙃" role="button" tabindex="0" 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_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>
                                     </ol>
                                     </div>
                                 </div>
diff --git a/test/unit-tests/utils/notifications-test.ts b/test/unit-tests/utils/notifications-test.ts
index 2a761f7670..5a416deede 100644
--- a/test/unit-tests/utils/notifications-test.ts
+++ b/test/unit-tests/utils/notifications-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
@@ -28,13 +28,13 @@ import {
     getMarkedUnreadState,
     setMarkedUnreadState,
 } from "../../../src/utils/notifications";
-import SettingsStore from "../../../src/settings/SettingsStore";
-import { getMockClientWithEventEmitter } from "../../test-utils/client";
+import { getMockClientWithEventEmitter, mockClientMethodsServer } from "../../test-utils/client";
 import { mkMessage, stubClient } from "../../test-utils/test-utils";
 import { MatrixClientPeg } from "../../../src/MatrixClientPeg";
 import { NotificationLevel } from "../../../src/stores/notifications/NotificationLevel";
-
-jest.mock("../../../src/settings/SettingsStore");
+import { SettingLevel } from "../../../src/settings/SettingLevel";
+import MatrixClientBackedController from "../../../src/settings/controllers/MatrixClientBackedController";
+import SettingsStore from "../../../src/settings/SettingsStore";
 
 describe("notifications", () => {
     let accountDataStore: Record<string, MatrixEvent> = {};
@@ -44,6 +44,7 @@ describe("notifications", () => {
     beforeEach(() => {
         jest.clearAllMocks();
         mockClient = getMockClientWithEventEmitter({
+            ...mockClientMethodsServer(),
             isGuest: jest.fn().mockReturnValue(false),
             getAccountData: jest.fn().mockImplementation((eventType) => accountDataStore[eventType]),
             setAccountData: jest.fn().mockImplementation((eventType, content) => {
@@ -52,10 +53,20 @@ describe("notifications", () => {
                     content,
                 });
             }),
+            isVersionSupported: jest.fn().mockImplementation(async (v) => v === "v1.4"),
         });
+
+        // Ensure unstable settings are supported, otherwise it will use the default value.
+        MatrixClientBackedController.matrixClient = mockClient;
         accountDataStore = {};
         accountDataEventKey = getLocalNotificationAccountDataEventType(mockClient.deviceId!);
-        mocked(SettingsStore).getValue.mockReturnValue(false);
+        // Disable all notifications
+        deviceNotificationSettingsKeys.forEach((k) => SettingsStore.setValue(k, null, SettingLevel.DEVICE, false));
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+        SettingsStore.reset();
     });
 
     describe("createLocalNotification", () => {
@@ -75,10 +86,15 @@ describe("notifications", () => {
         it.each(deviceNotificationSettingsKeys)(
             "unsilenced for existing sessions when %s setting is truthy",
             async (settingKey) => {
-                mocked(SettingsStore).getValue.mockImplementation((key): any => {
-                    return key === settingKey;
+                // We need to spy `getValue` because setting these keys requires mocking
+                // the platform to support notifications, which is out of scope for this test.
+                const origFn = SettingsStore.getValue;
+                jest.spyOn(SettingsStore, "getValue").mockImplementation((name, ...args) => {
+                    if (name === settingKey) {
+                        return true;
+                    }
+                    return origFn(name, ...args);
                 });
-
                 await createLocalNotificationSettingsIfNeeded(mockClient);
                 const event = mockClient.getAccountData(accountDataEventKey);
                 expect(event?.getContent().is_silenced).toBe(false);
@@ -116,7 +132,6 @@ describe("notifications", () => {
         const ROOM_ID = "123";
         const USER_ID = "@bob:example.org";
         let message: MatrixEvent;
-        let sendReceiptsSetting = true;
 
         beforeEach(() => {
             stubClient();
@@ -131,9 +146,7 @@ describe("notifications", () => {
             room.addLiveEvents([message], { addToState: true });
             sendReadReceiptSpy = jest.spyOn(client, "sendReadReceipt").mockResolvedValue({});
             jest.spyOn(client, "getRooms").mockReturnValue([room]);
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((name) => {
-                return name === "sendReadReceipts" && sendReceiptsSetting;
-            });
+            SettingsStore.setValue("sendReadReceipts", null, SettingLevel.DEVICE, true);
         });
 
         it("sends a request even if everything has been read", async () => {
@@ -152,11 +165,8 @@ describe("notifications", () => {
         });
 
         describe("when sendReadReceipts setting is disabled", () => {
-            beforeEach(() => {
-                sendReceiptsSetting = false;
-            });
-
             it("should send a private read receipt", async () => {
+                SettingsStore.setValue("sendReadReceipts", null, SettingLevel.DEVICE, false);
                 await clearRoomNotification(room, client);
                 expect(sendReadReceiptSpy).toHaveBeenCalledWith(message, ReceiptType.ReadPrivate, true);
             });
@@ -177,9 +187,7 @@ describe("notifications", () => {
             room = new Room(ROOM_ID, client, USER_ID);
             sendReadReceiptSpy = jest.spyOn(client, "sendReadReceipt").mockResolvedValue({});
             jest.spyOn(client, "getRooms").mockReturnValue([room]);
-            jest.spyOn(SettingsStore, "getValue").mockImplementation((name) => {
-                return name === "sendReadReceipts";
-            });
+            SettingsStore.setValue("sendReadReceipts", null, SettingLevel.DEVICE, true);
         });
 
         it("does not send any requests if everything has been read", () => {
@@ -212,7 +220,7 @@ describe("notifications", () => {
             room.addLiveEvents([message], { addToState: true });
             room.setUnreadNotificationCount(NotificationCountType.Total, 1);
 
-            jest.spyOn(SettingsStore, "getValue").mockReset().mockReturnValue(false);
+            SettingsStore.setValue("sendReadReceipts", null, SettingLevel.DEVICE, false);
 
             await clearAllNotifications(client);
 
diff --git a/test/unit-tests/utils/permalinks/Permalinks-test.ts b/test/unit-tests/utils/permalinks/Permalinks-test.ts
index 5effb8ed43..fcb7d3257f 100644
--- a/test/unit-tests/utils/permalinks/Permalinks-test.ts
+++ b/test/unit-tests/utils/permalinks/Permalinks-test.ts
@@ -116,7 +116,7 @@ describe("Permalinks", function () {
 
     it("should gracefully handle invalid MXIDs", () => {
         const roomId = "!fake:example.org";
-        const alice50 = makeMemberWithPL(roomId, "@alice:pl_50:org", 50);
+        const alice50 = makeMemberWithPL(roomId, "@alice:pl-50:org", 50);
         const room = mockRoom(roomId, [alice50]);
         const creator = new RoomPermalinkCreator(room);
         creator.load();
diff --git a/test/unit-tests/vector/platform/ElectronPlatform-test.ts b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
index 2633d15b14..40168231ac 100644
--- a/test/unit-tests/vector/platform/ElectronPlatform-test.ts
+++ b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
@@ -8,7 +8,7 @@ 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 { UpdateCheckStatus } from "../../../../src/BasePlatform";
 import { Action } from "../../../../src/dispatcher/actions";
@@ -19,6 +19,7 @@ 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";
 
 jest.mock("../../../../src/rageshake/rageshake", () => ({
     flush: jest.fn(),
@@ -31,7 +32,15 @@ describe("ElectronPlatform", () => {
     const mockElectron = {
         on: jest.fn(),
         send: jest.fn(),
-    };
+        initialise: jest.fn().mockResolvedValue({
+            protocol: "io.element.desktop",
+            sessionId: "session-id",
+            config: { _config: true },
+            supportedSettings: { setting1: false, setting2: true },
+        }),
+        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");
@@ -64,6 +73,17 @@ describe("ElectronPlatform", () => {
         expect(rageshake.flush).toHaveBeenCalled();
     });
 
+    it("should load config", async () => {
+        const platform = new ElectronPlatform();
+        await expect(platform.getConfig()).resolves.toEqual({ _config: true });
+    });
+
+    it("should return oidc client state as expected", async () => {
+        const platform = new ElectronPlatform();
+        await platform.getConfig();
+        expect(platform.getOidcClientState()).toMatchInlineSnapshot(`":element-desktop-ssoid:session-id"`);
+    });
+
     it("dispatches view settings action on preferences event", () => {
         new ElectronPlatform();
         const [event, handler] = getElectronEventHandlerCall("preferences")!;
@@ -287,7 +307,7 @@ describe("ElectronPlatform", () => {
         });
     });
 
-    describe("breacrumbs", () => {
+    describe("breadcrumbs", () => {
         it("should send breadcrumb updates over the IPC", () => {
             const spy = jest.spyOn(BreadcrumbsStore.instance, "on");
             new ElectronPlatform();
@@ -302,4 +322,87 @@ 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",
+        });
+    });
 });
diff --git a/test/unit-tests/vector/platform/WebPlatform-test.ts b/test/unit-tests/vector/platform/WebPlatform-test.ts
index b47f2d5537..7c1048fe05 100644
--- a/test/unit-tests/vector/platform/WebPlatform-test.ts
+++ b/test/unit-tests/vector/platform/WebPlatform-test.ts
@@ -12,6 +12,9 @@ import { UpdateCheckStatus } from "../../../../src/BasePlatform";
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import WebPlatform from "../../../../src/vector/platform/WebPlatform";
 import { setupLanguageMock } from "../../../setup/setupLanguage";
+import ToastStore from "../../../../src/stores/ToastStore.ts";
+import defaultDispatcher from "../../../../src/dispatcher/dispatcher.ts";
+import { emitPromise } from "../../../test-utils";
 
 fetchMock.config.overwriteRoutes = true;
 
@@ -26,11 +29,32 @@ describe("WebPlatform", () => {
         expect(platform.getHumanReadableName()).toEqual("Web Platform");
     });
 
-    it("registers service worker", () => {
-        // @ts-ignore - mocking readonly object
-        navigator.serviceWorker = { register: jest.fn() };
-        new WebPlatform();
-        expect(navigator.serviceWorker.register).toHaveBeenCalled();
+    describe("service worker", () => {
+        it("registers successfully", () => {
+            // @ts-expect-error - mocking readonly object
+            navigator.serviceWorker = {
+                register: jest.fn().mockResolvedValue({
+                    update: jest.fn(),
+                }),
+                addEventListener: jest.fn(),
+            };
+            new WebPlatform();
+            expect(navigator.serviceWorker.register).toHaveBeenCalled();
+        });
+
+        it("handles errors", async () => {
+            // @ts-expect-error - mocking readonly object
+            navigator.serviceWorker = {
+                register: undefined,
+            };
+            new WebPlatform();
+
+            defaultDispatcher.dispatch({ action: "client_started" });
+            await emitPromise(ToastStore.sharedInstance(), "update");
+            const toasts = ToastStore.sharedInstance().getToasts();
+            expect(toasts).toHaveLength(1);
+            expect(toasts[0].title).toEqual("Failed to load service worker");
+        });
     });
 
     it("should call reload on window location object", () => {
@@ -146,24 +170,20 @@ describe("WebPlatform", () => {
         });
 
         describe("pollForUpdate()", () => {
-            it(
-                "should return not available and call showNoUpdate when current version " +
-                    "matches most recent version",
-                async () => {
-                    // @ts-ignore
-                    WebPlatform.VERSION = prodVersion;
-                    fetchMock.getOnce("/version", prodVersion);
-                    const platform = new WebPlatform();
+            it("should return not available and call showNoUpdate when current version matches most recent version", async () => {
+                // @ts-ignore
+                WebPlatform.VERSION = prodVersion;
+                fetchMock.getOnce("/version", prodVersion);
+                const platform = new WebPlatform();
 
-                    const showUpdate = jest.fn();
-                    const showNoUpdate = jest.fn();
-                    const result = await platform.pollForUpdate(showUpdate, showNoUpdate);
+                const showUpdate = jest.fn();
+                const showNoUpdate = jest.fn();
+                const result = await platform.pollForUpdate(showUpdate, showNoUpdate);
 
-                    expect(result).toEqual({ status: UpdateCheckStatus.NotAvailable });
-                    expect(showUpdate).not.toHaveBeenCalled();
-                    expect(showNoUpdate).toHaveBeenCalled();
-                },
-            );
+                expect(result).toEqual({ status: UpdateCheckStatus.NotAvailable });
+                expect(showUpdate).not.toHaveBeenCalled();
+                expect(showNoUpdate).toHaveBeenCalled();
+            });
 
             it("should strip v prefix from versions before comparing", async () => {
                 // @ts-ignore
diff --git a/tsconfig.json b/tsconfig.json
index 854af09239..10d7c216b6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,7 @@
         "outDir": "./lib",
         "declaration": true,
         "jsx": "react",
-        "lib": ["es2022", "dom", "dom.iterable"],
+        "lib": ["es2022", "es2024.promise", "dom", "dom.iterable"],
         "strict": true,
         "paths": {
             "jest-matrix-react": ["./test/test-utils/jest-matrix-react"]
diff --git a/webpack.config.js b/webpack.config.js
index 531e9ea2b2..e0d7d4fe93 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -673,7 +673,6 @@ module.exports = (env, argv) => {
                     { from: "decoder-ring/**", context: path.resolve(__dirname, "res") },
                     { from: "media/**", context: path.resolve(__dirname, "res/") },
                     { from: "config.json", noErrorOnMissing: true },
-                    "contribute.json",
                     // Element Call embedded widget
                     {
                         from: "**",
diff --git a/yarn.lock b/yarn.lock
index 20716cb602..5eaa6648e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -51,26 +51,35 @@
     "@babel/highlight" "^7.25.7"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.26.5", "@babel/compat-data@^7.26.8":
-  version "7.26.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.8.tgz#821c1d35641c355284d4a870b8a4a7b0c141e367"
-  integrity sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==
+"@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.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/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.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.10.tgz#5c876f83c8c4dcb233ee4b670c0606f2ac3000f9"
-  integrity sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==
+  version "7.27.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.27.3.tgz#d7d05502bccede3cab36373ed142e6a1df554c2f"
+  integrity sha512-hyrN8ivxfvJ4i0fIJuV4EOlV0WDMz5Ui4StRTgVaAvWeiRCilXgwVvxJKtFQ3TKtHgJscB2YiXKGNJuVwhQMtA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.10"
-    "@babel/helper-compilation-targets" "^7.26.5"
-    "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.10"
-    "@babel/parser" "^7.26.10"
-    "@babel/template" "^7.26.9"
-    "@babel/traverse" "^7.26.10"
-    "@babel/types" "^7.26.10"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@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/template" "^7.27.2"
+    "@babel/traverse" "^7.27.3"
+    "@babel/types" "^7.27.3"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -78,18 +87,18 @@
     semver "^6.3.1"
 
 "@babel/eslint-parser@^7.12.10":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.26.10.tgz#4423cb3f84c26978439feabfe23c5aa929400737"
-  integrity sha512-QsfQZr4AiLpKqn7fz+j7SN+f43z2DZCgGyYbNJ2vJOqKfG4E6MZer1+jqGZqKJaxq/gdO2DC/nUu45+pOL5p2Q==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.27.1.tgz#e146fb2facef62c6c5d1a6fd07cfd79ee9f7b0f1"
+  integrity sha512-q8rjOuadH0V6Zo4XLMkJ3RMQ9MSBqwaDByyYB0izsYdaIWGNLmEblbCOf1vyFHICcg16CD7Fsi51vcQnYxmt6Q==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
 "@babel/eslint-plugin@^7.12.10":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.26.10.tgz#63c70823e8f4875dab8b976aa03d7246ca23d531"
-  integrity sha512-vOFlmZX0tzi58ggN8w2LGNOY2VOoqgYBtj2FRy+3BjFSvNvU+RnapXywHACzLqzbDi9yvS0CZEBokJ26ioUVLA==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.27.1.tgz#5e7cfeaa7a7b506d0ee74c62244e4e6b7a7043f6"
+  integrity sha512-vOG/EipZbIAcREK6XI4JRO3B3uZr70/KIhsrNLO9RXcgLMaW0sTsBpNeTpQUyelB0HsbWd45NIsuTgD3mqr/Og==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
@@ -103,36 +112,47 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/generator@^7.26.10", "@babel/generator@^7.26.9":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.10.tgz#a60d9de49caca16744e6340c3658dfef6138c3f7"
-  integrity sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==
+"@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.26.10"
-    "@babel/types" "^7.26.10"
+    "@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/helper-annotate-as-pure@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
-  integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==
+"@babel/generator@^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==
   dependencies:
-    "@babel/types" "^7.25.9"
+    "@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-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9", "@babel/helper-compilation-targets@^7.26.5":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8"
-  integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==
+"@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/compat-data" "^7.26.5"
-    "@babel/helper-validator-option" "^7.25.9"
+    "@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":
+  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-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.25.9":
+"@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==
@@ -145,19 +165,32 @@
     "@babel/traverse" "^7.26.9"
     semver "^6.3.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz#5169756ecbe1d95f7866b90bb555b022595302a0"
-  integrity sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==
+"@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.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@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"
+    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==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.27.1"
     regexpu-core "^6.2.0"
     semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21"
-  integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==
+"@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==
   dependencies:
     "@babel/helper-compilation-targets" "^7.22.6"
     "@babel/helper-plugin-utils" "^7.22.5"
@@ -173,22 +206,39 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helper-module-imports@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715"
-  integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==
+"@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==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/traverse" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae"
-  integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==
+"@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/helper-module-imports" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@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==
+  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"
@@ -197,26 +247,33 @@
   dependencies:
     "@babel/types" "^7.25.9"
 
-"@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.25.9", "@babel/helper-plugin-utils@^7.26.5":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
-  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
+"@babel/helper-optimise-call-expression@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz#c65221b61a643f3e62705e5dd2b5f115e35f9200"
+  integrity sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==
+  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":
+  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-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.25.7", "@babel/helper-plugin-utils@^7.8.0":
   version "7.25.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz#8ec5b21812d992e1ef88a9b068260537b6f0e36c"
   integrity sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==
 
-"@babel/helper-remap-async-to-generator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92"
-  integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==
+"@babel/helper-remap-async-to-generator@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz#4601d5c7ce2eb2aea58328d43725523fcd362ce6"
+  integrity sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-wrap-function" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-wrap-function" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
-"@babel/helper-replace-supers@^7.25.9", "@babel/helper-replace-supers@^7.26.5":
+"@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==
@@ -225,13 +282,14 @@
     "@babel/helper-optimise-call-expression" "^7.25.9"
     "@babel/traverse" "^7.26.5"
 
-"@babel/helper-simple-access@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739"
-  integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==
+"@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"
+  integrity sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==
   dependencies:
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-member-expression-to-functions" "^7.27.1"
+    "@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"
@@ -241,37 +299,55 @@
     "@babel/traverse" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/helper-string-parser@^7.25.7", "@babel/helper-string-parser@^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"
+  integrity sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==
+  dependencies:
+    "@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-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.25.7", "@babel/helper-validator-identifier@^7.25.9":
+"@babel/helper-string-parser@^7.25.9", "@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":
   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-option@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
-  integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
+"@babel/helper-validator-identifier@^7.25.9", "@babel/helper-validator-identifier@^7.27.1":
+  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-wrap-function@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0"
-  integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==
-  dependencies:
-    "@babel/template" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.25.9"
+"@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.26.10":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.10.tgz#6baea3cd62ec2d0c1068778d63cb1314f6637384"
-  integrity sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==
+"@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.26.9"
-    "@babel/types" "^7.26.10"
+    "@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==
+  dependencies:
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
 
 "@babel/highlight@^7.25.7":
   version "7.25.9"
@@ -290,67 +366,81 @@
   dependencies:
     "@babel/types" "^7.25.8"
 
-"@babel/parser@^7.24.4", "@babel/parser@^7.26.10", "@babel/parser@^7.26.9":
+"@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/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
-  integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==
+"@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/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/types" "^7.27.0"
 
-"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30"
-  integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==
+"@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/helper-plugin-utils" "^7.25.9"
+    "@babel/types" "^7.27.3"
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137"
-  integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1"
-  integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz#43f70a6d7efd52370eefbdf55ae03d91b293856d"
+  integrity sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/plugin-transform-optional-chaining" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e"
-  integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz#beb623bd573b8b6f3047bd04c32506adc3e58a72"
+  integrity sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz#e134a5479eb2ba9c02714e8c1ebf1ec9076124fd"
+  integrity sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@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==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
 "@babel/plugin-proposal-decorators@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.25.9.tgz#8680707f943d1a3da2cd66b948179920f097e254"
-  integrity sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==
+  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==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-syntax-decorators" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-syntax-decorators" "^7.27.1"
 
 "@babel/plugin-proposal-export-default-from@^7.12.1":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.25.9.tgz#52702be6ef8367fc8f18b8438278332beeb8f87c"
-  integrity sha512-ykqgwNfSnNOB+C8fV5X4mG3AVmvu+WVxcaU9xHHtBb7PCrPeweMmPjGsn8eMaeJg6SJuoUuZENeeSWaarWqonQ==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.27.1.tgz#59b050b0e5fdc366162ab01af4fcbac06ea40919"
+  integrity sha512-hjlsMBl1aJc5lp8MoCDEZCiYzlgdRAShOjAfRw6X+GlpLpUPU7c3XNLsKFZbQk/1cRzBlJ7CXg3xJAJMrFa1Uw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
@@ -393,12 +483,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.25.9.tgz#986b4ca8b7b5df3f67cee889cedeffc2e2bf14b3"
-  integrity sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==
+"@babel/plugin-syntax-decorators@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz#ee7dd9590aeebc05f9d4c8c0560007b05979a63d"
+  integrity sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -407,12 +497,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-import-assertions@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f"
-  integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==
+"@babel/plugin-syntax-import-assertions@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz#88894aefd2b03b5ee6ad1562a7c8e1587496aecd"
+  integrity sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-syntax-import-attributes@^7.24.7":
   version "7.25.7"
@@ -421,12 +511,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.7"
 
-"@babel/plugin-syntax-import-attributes@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7"
-  integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==
+"@babel/plugin-syntax-import-attributes@^7.27.1":
+  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.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-syntax-import-meta@^7.10.4":
   version "7.10.4"
@@ -442,12 +532,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290"
-  integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==
+"@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.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-syntax-jsx@^7.7.2":
   version "7.25.7"
@@ -512,12 +602,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399"
-  integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==
+"@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.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-syntax-typescript@^7.7.2":
   version "7.25.7"
@@ -534,311 +624,310 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845"
-  integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==
+"@babel/plugin-transform-arrow-functions@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz#6e2061067ba3ab0266d834a9f94811196f2aba9a"
+  integrity sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-async-generator-functions@^7.26.8":
-  version "7.26.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz#5e3991135e3b9c6eaaf5eff56d1ae5a11df45ff8"
-  integrity sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
-    "@babel/helper-remap-async-to-generator" "^7.25.9"
-    "@babel/traverse" "^7.26.8"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-remap-async-to-generator" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
-"@babel/plugin-transform-async-to-generator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71"
-  integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==
+"@babel/plugin-transform-async-to-generator@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz#9a93893b9379b39466c74474f55af03de78c66e7"
+  integrity sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==
   dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-remap-async-to-generator" "^7.25.9"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-remap-async-to-generator" "^7.27.1"
 
-"@babel/plugin-transform-block-scoped-functions@^7.26.5":
-  version "7.26.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz#3dc4405d31ad1cbe45293aa57205a6e3b009d53e"
-  integrity sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==
+"@babel/plugin-transform-block-scoped-functions@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz#558a9d6e24cf72802dd3b62a4b51e0d62c0f57f9"
+  integrity sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-block-scoping@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1"
-  integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-class-properties@^7.12.1", "@babel/plugin-transform-class-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f"
-  integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==
+"@babel/plugin-transform-class-properties@^7.12.1", "@babel/plugin-transform-class-properties@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz#dd40a6a370dfd49d32362ae206ddaf2bb082a925"
+  integrity sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@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":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0"
-  integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==
+"@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==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-classes@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52"
-  integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==
+"@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==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-compilation-targets" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-replace-supers" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b"
-  integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==
+"@babel/plugin-transform-computed-properties@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz#81662e78bf5e734a97982c2b7f0a793288ef3caa"
+  integrity sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/template" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/template" "^7.27.1"
 
-"@babel/plugin-transform-destructuring@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1"
-  integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==
+"@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.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-dotall-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a"
-  integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==
+"@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==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-duplicate-keys@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d"
-  integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==
+"@babel/plugin-transform-dotall-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz#aa6821de864c528b1fecf286f0a174e38e826f4d"
+  integrity sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31"
-  integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==
+"@babel/plugin-transform-duplicate-keys@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz#f1fbf628ece18e12e7b32b175940e68358f546d1"
+  integrity sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-dynamic-import@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8"
-  integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz#5043854ca620a94149372e69030ff8cb6a9eb0ec"
+  integrity sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-exponentiation-operator@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz#e29f01b6de302c7c2c794277a48f04a9ca7f03bc"
-  integrity sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==
+"@babel/plugin-transform-dynamic-import@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz#4c78f35552ac0e06aa1f6e3c573d67695e8af5a4"
+  integrity sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-export-namespace-from@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2"
-  integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-for-of@^7.26.9":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz#27231f79d5170ef33b5111f07fe5cafeb2c96a56"
-  integrity sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==
+"@babel/plugin-transform-export-namespace-from@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz#71ca69d3471edd6daa711cf4dfc3400415df9c23"
+  integrity sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-function-name@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97"
-  integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==
+"@babel/plugin-transform-for-of@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz#bc24f7080e9ff721b63a70ac7b2564ca15b6c40a"
+  integrity sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-json-strings@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660"
-  integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==
+"@babel/plugin-transform-function-name@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz#4d0bf307720e4dce6d7c30fcb1fd6ca77bdeb3a7"
+  integrity sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-compilation-targets" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
-"@babel/plugin-transform-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de"
-  integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==
+"@babel/plugin-transform-json-strings@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz#a2e0ce6ef256376bd527f290da023983527a4f4c"
+  integrity sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.20.7", "@babel/plugin-transform-logical-assignment-operators@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7"
-  integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==
+"@babel/plugin-transform-literals@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz#baaefa4d10a1d4206f9dcdda50d7d5827bb70b24"
+  integrity sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-member-expression-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de"
-  integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-amd@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5"
-  integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==
+"@babel/plugin-transform-member-expression-literals@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz#37b88ba594d852418e99536f5612f795f23aeaf9"
+  integrity sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-commonjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686"
-  integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==
+"@babel/plugin-transform-modules-amd@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz#a4145f9d87c2291fe2d05f994b65dba4e3e7196f"
+  integrity sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-simple-access" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-commonjs@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz#8f011d44b20d02c3de44d8850d971d8497f981fb"
-  integrity sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==
+"@babel/plugin-transform-modules-commonjs@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz#8e44ed37c2787ecc23bdc367f49977476614e832"
+  integrity sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-systemjs@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8"
-  integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==
+"@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==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/traverse" "^7.27.1"
 
-"@babel/plugin-transform-modules-umd@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9"
-  integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==
+"@babel/plugin-transform-modules-umd@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz#63f2cf4f6dc15debc12f694e44714863d34cd334"
+  integrity sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a"
-  integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz#f32b8f7818d8fc0cc46ee20a8ef75f071af976e1"
+  integrity sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-new-target@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd"
-  integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==
+"@babel/plugin-transform-new-target@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz#259c43939728cad1706ac17351b7e6a7bea1abeb"
+  integrity sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-nullish-coalescing-operator@^7.12.1", "@babel/plugin-transform-nullish-coalescing-operator@^7.26.6":
-  version "7.26.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz#fbf6b3c92cb509e7b319ee46e3da89c5bedd31fe"
-  integrity sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.12.1", "@babel/plugin-transform-nullish-coalescing-operator@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz#4f9d3153bf6782d73dd42785a9d22d03197bc91d"
+  integrity sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-numeric-separator@^7.12.7", "@babel/plugin-transform-numeric-separator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1"
-  integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==
+"@babel/plugin-transform-numeric-separator@^7.12.7", "@babel/plugin-transform-numeric-separator@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz#614e0b15cc800e5997dadd9bd6ea524ed6c819c6"
+  integrity sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-object-rest-spread@^7.12.1", "@babel/plugin-transform-object-rest-spread@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18"
-  integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==
+"@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==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-transform-parameters" "^7.25.9"
+    "@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-object-super@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03"
-  integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==
+"@babel/plugin-transform-object-super@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz#1c932cd27bf3874c43a5cac4f43ebf970c9871b5"
+  integrity sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-replace-supers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-replace-supers" "^7.27.1"
 
-"@babel/plugin-transform-optional-catch-binding@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3"
-  integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==
+"@babel/plugin-transform-optional-catch-binding@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz#84c7341ebde35ccd36b137e9e45866825072a30c"
+  integrity sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-optional-chaining@^7.12.7", "@babel/plugin-transform-optional-chaining@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd"
-  integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-parameters@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257"
-  integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-private-methods@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57"
-  integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==
+"@babel/plugin-transform-private-methods@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz#fdacbab1c5ed81ec70dfdbb8b213d65da148b6af"
+  integrity sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-private-property-in-object@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33"
-  integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==
+"@babel/plugin-transform-private-property-in-object@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz#4dbbef283b5b2f01a21e81e299f76e35f900fb11"
+  integrity sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-property-literals@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f"
-  integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==
+"@babel/plugin-transform-property-literals@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz#07eafd618800591e88073a0af1b940d9a42c6424"
+  integrity sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-transform-react-constant-elements@^7.21.3":
   version "7.25.7"
@@ -847,220 +936,219 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.25.7"
 
-"@babel/plugin-transform-react-display-name@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.25.9.tgz#4b79746b59efa1f38c8695065a92a9f5afb24f7d"
-  integrity sha512-KJfMlYIUxQB1CJfO3e0+h0ZHWOTLCPP115Awhaz8U0Zpq36Gl/cXlpoyMRnUWlhNUBAzldnCiAZNvCDj7CrKxQ==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-react-jsx-development@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.25.9.tgz#8fd220a77dd139c07e25225a903b8be8c829e0d7"
-  integrity sha512-9mj6rm7XVYs4mdLIpbZnHOYdpW42uoiBCTVowg7sP1thUOiANgMb4UtpRivR0pp5iL+ocvUv7X4mZgFRpJEzGw==
+"@babel/plugin-transform-react-jsx-development@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.27.1.tgz#47ff95940e20a3a70e68ad3d4fcb657b647f6c98"
+  integrity sha512-ykDdF5yI4f1WrAolLqeF3hmYU12j9ntLQl/AOG1HAS21jxyg1Q0/J/tpREuYLfatGdGmXp/3yS0ZA76kOlVq9Q==
   dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.25.9"
+    "@babel/plugin-transform-react-jsx" "^7.27.1"
 
-"@babel/plugin-transform-react-jsx@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166"
-  integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==
+"@babel/plugin-transform-react-jsx@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
+  integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/plugin-syntax-jsx" "^7.25.9"
-    "@babel/types" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-module-imports" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/plugin-syntax-jsx" "^7.27.1"
+    "@babel/types" "^7.27.1"
 
-"@babel/plugin-transform-react-pure-annotations@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.25.9.tgz#ea1c11b2f9dbb8e2d97025f43a3b5bc47e18ae62"
-  integrity sha512-KQ/Takk3T8Qzj5TppkS1be588lkbTp5uj7w6a0LeQaTMSckU/wK0oJ/pih+T690tkgI5jfmg2TqDJvd41Sj1Cg==
+"@babel/plugin-transform-react-pure-annotations@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.27.1.tgz#339f1ce355eae242e0649f232b1c68907c02e879"
+  integrity sha512-JfuinvDOsD9FVMTHpzA/pBLisxpv1aSf+OIV8lgH3MuWrks19R27e6a6DipIg4aX1Zm9Wpb04p8wljfKrVSnPA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-regenerator@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b"
-  integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    regenerator-transform "^0.15.2"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-regexp-modifiers@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850"
-  integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==
+"@babel/plugin-transform-regexp-modifiers@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz#df9ba5577c974e3f1449888b70b76169998a6d09"
+  integrity sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-reserved-words@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce"
-  integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==
+"@babel/plugin-transform-reserved-words@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz#40fba4878ccbd1c56605a4479a3a891ac0274bb4"
+  integrity sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/plugin-transform-runtime@^7.12.10":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.10.tgz#6b4504233de8238e7d666c15cde681dc62adff87"
-  integrity sha512-NWaL2qG6HRpONTnj4JvDU6th4jYeZOJgu3QhmFTCihib0ermtOJqktA5BduGm3suhhVe9EMP9c9+mfJ/I9slqw==
+  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==
   dependencies:
-    "@babel/helper-module-imports" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.26.5"
+    "@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"
     semver "^6.3.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2"
-  integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==
+"@babel/plugin-transform-shorthand-properties@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz#532abdacdec87bfee1e0ef8e2fcdee543fe32b90"
+  integrity sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-spread@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9"
-  integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==
+"@babel/plugin-transform-spread@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz#1a264d5fc12750918f50e3fe3e24e437178abb08"
+  integrity sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
 
-"@babel/plugin-transform-sticky-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32"
-  integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==
+"@babel/plugin-transform-sticky-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz#18984935d9d2296843a491d78a014939f7dcd280"
+  integrity sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-template-literals@^7.26.8":
-  version "7.26.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz#966b15d153a991172a540a69ad5e1845ced990b5"
-  integrity sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==
+"@babel/plugin-transform-template-literals@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz#1a0eb35d8bb3e6efc06c9fd40eb0bcef548328b8"
+  integrity sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-typeof-symbol@^7.26.7":
-  version "7.26.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz#d0e33acd9223744c1e857dbd6fa17bd0a3786937"
-  integrity sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==
+"@babel/plugin-transform-typeof-symbol@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz#70e966bb492e03509cf37eafa6dcc3051f844369"
+  integrity sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.26.5"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-typescript@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.9.tgz#69267905c2b33c2ac6d8fe765e9dc2ddc9df3849"
-  integrity sha512-7PbZQZP50tzv2KGGnhh82GSyMB01yKY9scIjf1a+GfZCtInOWqUH5+1EBU4t9fyR5Oykkkc9vFTs4OHrhHXljQ==
+"@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==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.25.9"
-    "@babel/helper-create-class-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9"
-    "@babel/plugin-syntax-typescript" "^7.25.9"
+    "@babel/helper-annotate-as-pure" "^7.27.1"
+    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
+    "@babel/plugin-syntax-typescript" "^7.27.1"
 
-"@babel/plugin-transform-unicode-escapes@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82"
-  integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==
+"@babel/plugin-transform-unicode-escapes@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz#3e3143f8438aef842de28816ece58780190cf806"
+  integrity sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-unicode-property-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3"
-  integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==
+"@babel/plugin-transform-unicode-property-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz#bdfe2d3170c78c5691a3c3be934c8c0087525956"
+  integrity sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-unicode-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1"
-  integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==
+"@babel/plugin-transform-unicode-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz#25948f5c395db15f609028e370667ed8bae9af97"
+  integrity sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-unicode-sets-regex@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe"
-  integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==
+"@babel/plugin-transform-unicode-sets-regex@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz#6ab706d10f801b5c72da8bb2548561fa04193cd1"
+  integrity sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.25.9"
-    "@babel/helper-plugin-utils" "^7.25.9"
+    "@babel/helper-create-regexp-features-plugin" "^7.27.1"
+    "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.20.2":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.9.tgz#2ec64e903d0efe743699f77a10bdf7955c2123c3"
-  integrity sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==
+  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==
   dependencies:
-    "@babel/compat-data" "^7.26.8"
-    "@babel/helper-compilation-targets" "^7.26.5"
-    "@babel/helper-plugin-utils" "^7.26.5"
-    "@babel/helper-validator-option" "^7.25.9"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9"
-    "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9"
+    "@babel/compat-data" "^7.27.2"
+    "@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-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-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-import-assertions" "^7.26.0"
-    "@babel/plugin-syntax-import-attributes" "^7.26.0"
+    "@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.25.9"
-    "@babel/plugin-transform-async-generator-functions" "^7.26.8"
-    "@babel/plugin-transform-async-to-generator" "^7.25.9"
-    "@babel/plugin-transform-block-scoped-functions" "^7.26.5"
-    "@babel/plugin-transform-block-scoping" "^7.25.9"
-    "@babel/plugin-transform-class-properties" "^7.25.9"
-    "@babel/plugin-transform-class-static-block" "^7.26.0"
-    "@babel/plugin-transform-classes" "^7.25.9"
-    "@babel/plugin-transform-computed-properties" "^7.25.9"
-    "@babel/plugin-transform-destructuring" "^7.25.9"
-    "@babel/plugin-transform-dotall-regex" "^7.25.9"
-    "@babel/plugin-transform-duplicate-keys" "^7.25.9"
-    "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9"
-    "@babel/plugin-transform-dynamic-import" "^7.25.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.26.3"
-    "@babel/plugin-transform-export-namespace-from" "^7.25.9"
-    "@babel/plugin-transform-for-of" "^7.26.9"
-    "@babel/plugin-transform-function-name" "^7.25.9"
-    "@babel/plugin-transform-json-strings" "^7.25.9"
-    "@babel/plugin-transform-literals" "^7.25.9"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.25.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.25.9"
-    "@babel/plugin-transform-modules-amd" "^7.25.9"
-    "@babel/plugin-transform-modules-commonjs" "^7.26.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.25.9"
-    "@babel/plugin-transform-modules-umd" "^7.25.9"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9"
-    "@babel/plugin-transform-new-target" "^7.25.9"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.26.6"
-    "@babel/plugin-transform-numeric-separator" "^7.25.9"
-    "@babel/plugin-transform-object-rest-spread" "^7.25.9"
-    "@babel/plugin-transform-object-super" "^7.25.9"
-    "@babel/plugin-transform-optional-catch-binding" "^7.25.9"
-    "@babel/plugin-transform-optional-chaining" "^7.25.9"
-    "@babel/plugin-transform-parameters" "^7.25.9"
-    "@babel/plugin-transform-private-methods" "^7.25.9"
-    "@babel/plugin-transform-private-property-in-object" "^7.25.9"
-    "@babel/plugin-transform-property-literals" "^7.25.9"
-    "@babel/plugin-transform-regenerator" "^7.25.9"
-    "@babel/plugin-transform-regexp-modifiers" "^7.26.0"
-    "@babel/plugin-transform-reserved-words" "^7.25.9"
-    "@babel/plugin-transform-shorthand-properties" "^7.25.9"
-    "@babel/plugin-transform-spread" "^7.25.9"
-    "@babel/plugin-transform-sticky-regex" "^7.25.9"
-    "@babel/plugin-transform-template-literals" "^7.26.8"
-    "@babel/plugin-transform-typeof-symbol" "^7.26.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.25.9"
-    "@babel/plugin-transform-unicode-property-regex" "^7.25.9"
-    "@babel/plugin-transform-unicode-regex" "^7.25.9"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.25.9"
+    "@babel/plugin-transform-arrow-functions" "^7.27.1"
+    "@babel/plugin-transform-async-generator-functions" "^7.27.1"
+    "@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-class-properties" "^7.27.1"
+    "@babel/plugin-transform-class-static-block" "^7.27.1"
+    "@babel/plugin-transform-classes" "^7.27.1"
+    "@babel/plugin-transform-computed-properties" "^7.27.1"
+    "@babel/plugin-transform-destructuring" "^7.27.1"
+    "@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-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-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-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-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-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-regexp-modifiers" "^7.27.1"
+    "@babel/plugin-transform-reserved-words" "^7.27.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.27.1"
+    "@babel/plugin-transform-spread" "^7.27.1"
+    "@babel/plugin-transform-sticky-regex" "^7.27.1"
+    "@babel/plugin-transform-template-literals" "^7.27.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.27.1"
+    "@babel/plugin-transform-unicode-escapes" "^7.27.1"
+    "@babel/plugin-transform-unicode-property-regex" "^7.27.1"
+    "@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"
@@ -1078,52 +1166,50 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.12.10", "@babel/preset-react@^7.18.6":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.26.3.tgz#7c5e028d623b4683c1f83a0bd4713b9100560caa"
-  integrity sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.27.1.tgz#86ea0a5ca3984663f744be2fd26cb6747c3fd0ec"
+  integrity sha512-oJHWh2gLhU9dW9HHr42q0cI0/iHHXTLGe39qvpAZZzagHy0MzYLCnCVV0symeRvzmjHyVU7mw2K06E6u/JwbhA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-validator-option" "^7.25.9"
-    "@babel/plugin-transform-react-display-name" "^7.25.9"
-    "@babel/plugin-transform-react-jsx" "^7.25.9"
-    "@babel/plugin-transform-react-jsx-development" "^7.25.9"
-    "@babel/plugin-transform-react-pure-annotations" "^7.25.9"
+    "@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-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.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz#4a570f1b8d104a242d923957ffa1eaff142a106d"
-  integrity sha512-NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz#190742a6428d282306648a55b0529b561484f912"
+  integrity sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.25.9"
-    "@babel/helper-validator-option" "^7.25.9"
-    "@babel/plugin-syntax-jsx" "^7.25.9"
-    "@babel/plugin-transform-modules-commonjs" "^7.25.9"
-    "@babel/plugin-transform-typescript" "^7.25.9"
+    "@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/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.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2"
-  integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==
+"@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/template@^7.25.7", "@babel/template@^7.27.1", "@babel/template@^7.27.2", "@babel/template@^7.3.3":
+  version "7.27.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
+  integrity sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==
   dependencies:
-    regenerator-runtime "^0.14.0"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/parser" "^7.27.2"
+    "@babel/types" "^7.27.1"
 
-"@babel/template@^7.25.7", "@babel/template@^7.3.3":
-  version "7.25.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.7.tgz#27f69ce382855d915b14ab0fe5fb4cbf88fa0769"
-  integrity sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==
-  dependencies:
-    "@babel/code-frame" "^7.25.7"
-    "@babel/parser" "^7.25.7"
-    "@babel/types" "^7.25.7"
-
-"@babel/template@^7.25.9", "@babel/template@^7.26.9":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.26.9.tgz#4577ad3ddf43d194528cff4e1fa6b232fa609bb2"
-  integrity sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==
+"@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.26.9"
-    "@babel/types" "^7.26.9"
+    "@babel/parser" "^7.27.0"
+    "@babel/types" "^7.27.0"
 
 "@babel/traverse@^7.18.5":
   version "7.25.7"
@@ -1138,7 +1224,20 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.10", "@babel/traverse@^7.26.5", "@babel/traverse@^7.26.9":
+"@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==
@@ -1151,16 +1250,16 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/traverse@^7.26.8":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.9.tgz#4398f2394ba66d05d988b2ad13c219a2c857461a"
-  integrity sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==
+"@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==
   dependencies:
-    "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.9"
-    "@babel/parser" "^7.26.9"
-    "@babel/template" "^7.26.9"
-    "@babel/types" "^7.26.9"
+    "@babel/code-frame" "^7.27.1"
+    "@babel/generator" "^7.27.3"
+    "@babel/parser" "^7.27.3"
+    "@babel/template" "^7.27.2"
+    "@babel/types" "^7.27.3"
     debug "^4.3.1"
     globals "^11.1.0"
 
@@ -1181,21 +1280,29 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
-"@babel/types@^7.25.9", "@babel/types@^7.26.10", "@babel/types@^7.26.9":
-  version "7.26.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.10.tgz#396382f6335bd4feb65741eacfc808218f859259"
-  integrity sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==
+"@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.4.4":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.9.tgz#08b43dec79ee8e682c2ac631c010bdcac54a21ce"
-  integrity sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==
+"@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==
   dependencies:
-    "@babel/helper-string-parser" "^7.25.9"
-    "@babel/helper-validator-identifier" "^7.25.9"
+    "@babel/helper-string-parser" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.27.1"
 
 "@balena/dockerignore@^1.0.2":
   version "1.0.2"
@@ -1560,29 +1667,51 @@
   resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
   integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
 
-"@element-hq/element-call-embedded@0.9.0":
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-call-embedded/-/element-call-embedded-0.9.0.tgz#459c5a304ad9f97e942120518c70eeaffbe45ac7"
-  integrity sha512-W/ocQqfzU1rqwjLBCjCpeIEJTX2iCqn8CR3GRF0kqd5wsehPDhIsGPnUDmFalY/iN15eRDx/hex2rgOOJzFoGg==
+"@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-web-module-api@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-web-module-api/-/element-web-module-api-0.1.1.tgz#e2b24aa38aa9f7b6af3c4993e6402a8b7e2f3cb5"
-  integrity sha512-qtEQD5nFaRJ+vfAis7uhKB66SyCjrz7O+qGz/hKJjgNhBLT/6C5DK90waKINXSw0J3stFR43IWzEk5GBOrTMow==
+"@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-playwright-common@^1.1.5":
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/@element-hq/element-web-playwright-common/-/element-web-playwright-common-1.1.5.tgz#e9d4e24f0f284d16b7dc8cb9cd893521e1645be0"
-  integrity sha512-Cw2PqaU9YUx/qHq8nybjfxMhSGshkvZiRBPMhYnamjMTjUiSEEF74061gjIecxLF/3hgV6I0dGp5Km3FhRbTPQ==
+  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==
   dependencies:
     "@axe-core/playwright" "^4.10.1"
-    "@testcontainers/postgresql" "^10.18.0"
+    "@testcontainers/postgresql" "^11.0.0"
     lodash-es "^4.17.21"
     mailpit-api "^1.2.0"
     strip-ansi "^7.1.0"
-    testcontainers "^10.18.0"
+    testcontainers "^11.0.0"
     yaml "^2.7.0"
 
+"@emnapi/core@^1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.4.3.tgz#9ac52d2d5aea958f67e52c40a065f51de59b77d6"
+  integrity sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==
+  dependencies:
+    "@emnapi/wasi-threads" "1.0.2"
+    tslib "^2.4.0"
+
+"@emnapi/runtime@^1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.3.tgz#c0564665c80dc81c448adac23f9dfbed6c838f7d"
+  integrity sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==
+  dependencies:
+    tslib "^2.4.0"
+
+"@emnapi/wasi-threads@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz#977f44f844eac7d6c138a415a123818c655f874c"
+  integrity sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@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"
@@ -1591,9 +1720,16 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/eslint-utils@^4.4.0":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz#b0fc7e06d0c94f801537fd4237edc2706d3b8e4c"
-  integrity sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==
+  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==
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
@@ -1627,11 +1763,6 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
-"@fastify/busboy@^2.0.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
-  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
-
 "@floating-ui/core@^1.6.0":
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12"
@@ -1678,38 +1809,56 @@
   resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-5.2.5.tgz#69efffe6ccfae138cbe1806f41daa39cef986b59"
   integrity sha512-kbsPKj0S4p44JdYRFiW78Td8Ge2sBVxi/PIBwmih+RpSXUdvS9nbs1HIiuUSPtRMi14CqLEZ/fbk7dj7vni1Sg==
 
-"@formatjs/ecma402-abstract@2.3.3":
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.3.tgz#fbc7555c9e4fdd104cd5e23129fa3735be3ad0ba"
-  integrity sha512-pJT1OkhplSmvvr6i3CWTPvC/FGC06MbN5TNBfRO6Ox62AEz90eMq+dVvtX9Bl3jxCEkS0tATzDarRZuOLw7oFg==
+"@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==
   dependencies:
-    "@formatjs/fast-memoize" "2.2.6"
-    "@formatjs/intl-localematcher" "0.6.0"
-    decimal.js "10"
-    tslib "2"
+    "@formatjs/fast-memoize" "2.2.7"
+    "@formatjs/intl-localematcher" "0.6.1"
+    decimal.js "^10.4.3"
+    tslib "^2.8.0"
 
-"@formatjs/fast-memoize@2.2.6":
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.6.tgz#fac0a84207a1396be1f1aa4ee2805b179e9343d1"
-  integrity sha512-luIXeE2LJbQnnzotY1f2U2m7xuQNj2DA8Vq4ce1BY9ebRZaoPB1+8eZ6nXpLzsxuW5spQxr7LdCg+CApZwkqkw==
+"@formatjs/fast-memoize@2.2.7":
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.7.tgz#707f9ddaeb522a32f6715bb7950b0831f4cc7b15"
+  integrity sha512-Yabmi9nSvyOMrlSeGGWDiH7rf3a7sIwplbvo/dlz9WCIjzIQAfy1RMf4S0X3yG724n5Ghu2GmEl5NJIV6O9sZQ==
   dependencies:
-    tslib "2"
+    tslib "^2.8.0"
 
-"@formatjs/intl-localematcher@0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.6.0.tgz#33cf0d33279572c990e02ab75a93122569878082"
-  integrity sha512-4rB4g+3hESy1bHSBG3tDFaMY2CH67iT7yne1e+0CLTsGLDcmoEWWpJjjpWVaYgYfYuohIRuo0E+N536gd2ZHZA==
+"@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==
   dependencies:
-    tslib "2"
+    tslib "^2.8.0"
 
 "@formatjs/intl-segmenter@^11.5.7":
-  version "11.7.9"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.7.9.tgz#8aa0a57a76a0c9ad7e85726e548fbc6e213ecb3e"
-  integrity sha512-Nr7Qn5rTDYP+6WKrwiZTfOZXeFIvIF/7RUSKNZu68N0zzsYyKWXiEH0FjdMU+2FlEGM1ZdGQkHASvdItv7It9A==
+  version "11.7.10"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-segmenter/-/intl-segmenter-11.7.10.tgz#31308d6d3a22f240f744b76fc5217fec464cf107"
+  integrity sha512-P938HeVcdhFFShvBEZWlQF1t6ES9CnwPgeGboLspc0p5q9rCjQ6atNEkLZoDjes0MKAWbgJzTsPjNjTh4ggqoA==
   dependencies:
-    "@formatjs/ecma402-abstract" "2.3.3"
-    "@formatjs/intl-localematcher" "0.6.0"
-    tslib "2"
+    "@formatjs/ecma402-abstract" "2.3.4"
+    "@formatjs/intl-localematcher" "0.6.1"
+    tslib "^2.8.0"
+
+"@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==
+  dependencies:
+    "@grpc/proto-loader" "^0.7.13"
+    "@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"
 
 "@humanwhocodes/config-array@^0.13.0":
   version "0.13.0"
@@ -1998,15 +2147,20 @@
     "@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==
+
 "@jsonjoy.com/base64@^1.1.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-1.1.2.tgz#cf8ea9dcb849b81c95f14fc0aaa151c6b54d2578"
   integrity sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==
 
 "@jsonjoy.com/json-pack@^1.0.3":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.1.1.tgz#1f2db19ab1fd3304ccac259a1ef1dc6aff6df0ba"
-  integrity sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.2.0.tgz#e658900e81d194903171c42546e1aa27f446846a"
+  integrity sha512-io1zEbbYcElht3tdlqEOFxZ0dMTYrHz9iMf0gqn1pPjZFTCgM5R4R5IMA20Chb2UPYYsxjzs8CgZ7Nb5n2K2rA==
   dependencies:
     "@jsonjoy.com/base64" "^1.1.1"
     "@jsonjoy.com/util" "^1.1.2"
@@ -2070,10 +2224,10 @@
   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.1.0":
-  version "23.1.0"
-  resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.1.0.tgz#ad59731b0547ee0986ba4ccff699894dd60f0650"
-  integrity sha512-R6/ihEuC5KRexmKIYkWqUv84Gm+/QwsOUgHyt1yy2XqCdGdLvlBWVWIIeTZWN4NGdwmY6xDzdSGU2R9oBLNg2w==
+"@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==
   dependencies:
     "@mapbox/jsonlint-lines-primitives" "~2.0.2"
     "@mapbox/unitbezier" "^0.0.1"
@@ -2096,10 +2250,10 @@
     emojibase "^15.3.1"
     emojibase-data "^15.3.1"
 
-"@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==
+"@matrix-org/matrix-sdk-crypto-wasm@^14.2.0":
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.2.0.tgz#1d6bddb2f777ac1674546467aab6f8584a7f2e71"
+  integrity sha512-xYbH1Yg8YwfXxGsCVDypiRvSVYPnCybsoRqlBDuAvIOs9tOfmdeeJqN+3VxvLWH28g3CtJs+9Afw8dYSHViTFg==
 
 "@matrix-org/olm@3.2.15":
   version "3.2.15"
@@ -2114,9 +2268,18 @@
     "@babel/runtime" "^7.17.9"
 
 "@matrix-org/spec@^1.7.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.13.0.tgz#30c6c1e6993a93139f49d43e0c8fb9880f2f99ac"
-  integrity sha512-rvBRT3MRZXhPPclAbDY5L4x6xJbi7yqRAOvD11QWwu/RzFra8DYf58GSy45Kw70QyfyyRMBvKMil8zzY0+LMfA==
+  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==
+
+"@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==
+  dependencies:
+    "@emnapi/core" "^1.4.3"
+    "@emnapi/runtime" "^1.4.3"
+    "@tybys/wasm-util" "^0.9.0"
 
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
@@ -2133,32 +2296,11 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.scandir@4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-4.0.1.tgz#4b981a1d6e34e2baff9a33c84b57709e30e8ce30"
-  integrity sha512-vAkI715yhnmiPupY+dq+xenu5Tdf2TBQ66jLvBIcCddtz+5Q8LbMKaf9CIJJreez8fQ8fgaY+RaywQx8RJIWpw==
-  dependencies:
-    "@nodelib/fs.stat" "4.0.0"
-    run-parallel "^1.2.0"
-
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   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.stat@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-4.0.0.tgz#d609b10d9c17dac012c4d7be93602ed939861e58"
-  integrity sha512-ctr6bByzksKRCV0bavi8WoQevU6plSp2IkllIsEqaiKe2mwNNnaluhnRhcsgGZHrrHk57B3lf95MkLMO3STYcg==
-
-"@nodelib/fs.walk@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-3.0.1.tgz#717a03eb1d07c09db32f884a5d0c06ccd9b657f4"
-  integrity sha512-nIh/M6Kh3ZtOmlY00DaUYB4xeeV6F3/ts1l29iwl3/cfyY/OuCfUx+v08zgx8TKPTifXRcjjqVQ4KB2zOYSbyw==
-  dependencies:
-    "@nodelib/fs.scandir" "4.0.1"
-    fastq "^1.15.0"
-
 "@nodelib/fs.walk@^1.2.3", "@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"
@@ -2167,6 +2309,73 @@
     "@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-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-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-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-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-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-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-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-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-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-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==
+  dependencies:
+    "@napi-rs/wasm-runtime" "^0.2.9"
+
+"@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-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==
+
 "@peculiar/asn1-schema@^2.3.13", "@peculiar/asn1-schema@^2.3.8":
   version "2.3.13"
   resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.13.tgz#ec8509cdcbc0da3abe73fd7e690556b57a61b8f4"
@@ -2199,12 +2408,12 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@playwright/test@1.51.1", "@playwright/test@^1.50.1":
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.51.1.tgz#75357d513221a7be0baad75f01e966baf9c41a2e"
-  integrity sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==
+"@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==
   dependencies:
-    playwright "1.51.1"
+    playwright "1.52.0"
 
 "@polka/url@^1.0.0-next.24":
   version "1.0.0-next.28"
@@ -2216,6 +2425,59 @@
   resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8"
   integrity sha512-KJKkiKG63ugBjf8U0e9jUcI9CLPTFIsxXplEDE0oi3mPpxd90X9SJovo3W2l7yh/ARKIYXhQq8fSXUN7M29TzQ==
 
+"@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==
+
 "@radix-ui/primitive@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
@@ -2497,64 +2759,69 @@
   resolved "https://registry.yarnpkg.com/@radix-ui/rect/-/rect-1.1.0.tgz#f817d1d3265ac5415dadc67edab30ae196696438"
   integrity sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==
 
+"@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==
+
 "@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.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-9.6.0.tgz#a3c0cc17f3562e40bca0085df5c4374f91aea44d"
-  integrity sha512-zk64wOc3jIHDeZ26sksRg4TfdpuAG6VP0/VZyXKX0f3QVi/jzb1VoVGfP7/BdtLo2Be1+60f7gGPyt/wvcJkqg==
+"@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==
   dependencies:
-    "@sentry/core" "9.6.0"
+    "@sentry/core" "9.23.0"
 
-"@sentry-internal/feedback@9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-9.6.0.tgz#29ee78a66ff13513c84b0060a05fd8a5aa8ba361"
-  integrity sha512-SWGJC2eRl28KU7IHLDhHj1Kv0S9a6m1F+YYuve3ypIoYNkIyLJjy8EV6KM/Byepm+QhVTlFLh2bOQl8LUMjsNw==
+"@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==
   dependencies:
-    "@sentry/core" "9.6.0"
+    "@sentry/core" "9.23.0"
 
-"@sentry-internal/replay-canvas@9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-9.6.0.tgz#7ecadcfab98a1d9a7734e3edf3e0c37e1e3c1417"
-  integrity sha512-xNZPQvgNJ4CJSn+3tGaYao57yRqDLh79r2cf29P69jLSmKN5TT04thdMr/urCb9Ba9rcmG3uIAcJv8Y3SNm8gA==
+"@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==
   dependencies:
-    "@sentry-internal/replay" "9.6.0"
-    "@sentry/core" "9.6.0"
+    "@sentry-internal/replay" "9.23.0"
+    "@sentry/core" "9.23.0"
 
-"@sentry-internal/replay@9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-9.6.0.tgz#eb8f75a66bbea708c7a668e452c64808f8254ed7"
-  integrity sha512-+F9xcc4XIMzLgItis3kScbUZgOPrtMIwRL61gzSoYFyYAAp+in3Kq9vJ1eY+LcQKKnJ0DgzUFXU8YVs3yRTWxg==
+"@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==
   dependencies:
-    "@sentry-internal/browser-utils" "9.6.0"
-    "@sentry/core" "9.6.0"
+    "@sentry-internal/browser-utils" "9.23.0"
+    "@sentry/core" "9.23.0"
 
-"@sentry/babel-plugin-component-annotate@3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.2.2.tgz#0c5f26e417b8f524924fa4531b82ad5603216e90"
-  integrity sha512-D+SKQ266ra/wo87s9+UI/rKQi3qhGPCR8eSCDe0VJudhjHsqyNU+JJ5lnIGCgmZaWFTXgdBP/gdr1Iz1zqGs4Q==
+"@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/browser@^9.0.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.6.0.tgz#220235296ffde3edbb3fffe39d8f9ca4413763f8"
-  integrity sha512-8tOmdbaEUVcousqnqhQ0bx+IG8kXVYV1dXgSvFQUaCsm0TEWMosoN25cSridImTN9B0M6YBY0ONx1cdKdRmw/w==
+  version "9.23.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-9.23.0.tgz#8fdc4e393c8b893ca467d577bb7b11d038650641"
+  integrity sha512-QRkNxWys8e088260vByztoTsEVZ0W6v/XnZfKT6wkPPGn0aFeOrg/xjgxfI8D5huqZCxT28Cf23akOOly4FXjg==
   dependencies:
-    "@sentry-internal/browser-utils" "9.6.0"
-    "@sentry-internal/feedback" "9.6.0"
-    "@sentry-internal/replay" "9.6.0"
-    "@sentry-internal/replay-canvas" "9.6.0"
-    "@sentry/core" "9.6.0"
+    "@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/bundler-plugin-core@3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.2.2.tgz#c9193b0c97acf0097fdb820d86eaaad9c9b6b2c4"
-  integrity sha512-YGrtmqQ2jMixccX2slVG/Lw7pCGJL3DGB3clmY9mO8QBEBIN3/gEANiHJVWwRidpUOS/0b7yVVGAdwZ87oPwTg==
+"@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==
   dependencies:
     "@babel/core" "^7.18.5"
-    "@sentry/babel-plugin-component-annotate" "3.2.2"
+    "@sentry/babel-plugin-component-annotate" "3.5.0"
     "@sentry/cli" "2.42.2"
     dotenv "^16.3.1"
     find-up "^5.0.0"
@@ -2616,17 +2883,17 @@
     "@sentry/cli-win32-i686" "2.42.2"
     "@sentry/cli-win32-x64" "2.42.2"
 
-"@sentry/core@9.6.0":
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.6.0.tgz#15e1a43d4e6371fac66c2d83233aeb09c4cea035"
-  integrity sha512-t51h6HKlPYW3TfeM09mZ6uDd95A7lgYpD5lUV54ilBA3TefS+M9I32MKwAW7yHzzWs0WQxOdm56eoDBOmRDpHQ==
+"@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/webpack-plugin@^3.0.0":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-3.2.2.tgz#716ab462279c25cea17490d02cb1d22b00f3f661"
-  integrity sha512-6OkVKNOjKk8P9j7oh6svZ+kEP1i9YIHBC2aGWL2XsgeZTIrMBxJAXtOf+qSrfMAxEtibSroGVOMQc/y3WJTQtg==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-3.5.0.tgz#cde95534f1e945a4002d47465aeda01d382cd279"
+  integrity sha512-xvclj0QY2HyU7uJLzOlHSrZQBDwfnGKJxp8mmlU4L7CwmK+8xMCqlO7tYZoqE4K/wU3c2xpXql70x8qmvNMxzQ==
   dependencies:
-    "@sentry/bundler-plugin-core" "3.2.2"
+    "@sentry/bundler-plugin-core" "3.5.0"
     unplugin "1.0.1"
     uuid "^9.0.0"
 
@@ -2649,21 +2916,12 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@snyk/github-codeowners@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@snyk/github-codeowners/-/github-codeowners-1.1.0.tgz#45b99732c3c38b5f5b47e43d2b0c9db67a6d2bcc"
-  integrity sha512-lGFf08pbkEac0NYgVf4hdANpAgApRjNByLXB+WBip3qj1iendOIyAwP2GKkKbQMNVy2r1xxDf0ssfWscoiC+Vw==
+"@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==
   dependencies:
-    commander "^4.1.1"
-    ignore "^5.1.8"
-    p-map "^4.0.0"
-
-"@stylistic/eslint-plugin@^3.0.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-3.1.0.tgz#a9f655c518f76bfc5feb46b467d0f06e511b289d"
-  integrity sha512-pA6VOrOqk0+S8toJYhQGv2MWpQQR0QpeUo9AhNkC49Y26nxBQ/nH1rta9bUU1rPw2fJ1zZEMV5oCX5AazT7J2g==
-  dependencies:
-    "@typescript-eslint/utils" "^8.13.0"
+    "@typescript-eslint/utils" "^8.32.1"
     eslint-visitor-keys "^4.2.0"
     espree "^10.3.0"
     estraverse "^5.3.0"
@@ -2775,12 +3033,12 @@
     "@svgr/plugin-jsx" "8.1.0"
     "@svgr/plugin-svgo" "8.1.0"
 
-"@testcontainers/postgresql@^10.18.0":
-  version "10.19.0"
-  resolved "https://registry.yarnpkg.com/@testcontainers/postgresql/-/postgresql-10.19.0.tgz#e1ff9fbfee76c23bc899865524ee8e2ee297bdf2"
-  integrity sha512-3+yQJHCWEtp4hylfZgRxCWN1P6dGqKhFM7Bypg22NpJqq1x/dcmamVCvD+4eTdm1uHV1Ta0BkHRWejxGOyTnrw==
+"@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==
   dependencies:
-    testcontainers "^10.19.0"
+    testcontainers "^11.0.0"
 
 "@testing-library/dom@^10.4.0":
   version "10.4.0"
@@ -2810,9 +3068,9 @@
     redent "^3.0.0"
 
 "@testing-library/react@^16.0.0":
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.2.0.tgz#c96126ee01a49cdb47175721911b4a9432afc601"
-  integrity sha512-2cSskAvA1QNtKc8Y9VJQRv0tm3hLVgxRGDB+KYhIaPQJ1I+RHbhIXcM+zClKXzMes/wshsMVzf4B9vS4IZpqDQ==
+  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"
 
@@ -2851,6 +3109,13 @@
   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==
+  dependencies:
+    tslib "^2.4.0"
+
 "@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"
@@ -2947,10 +3212,10 @@
     "@types/node" "*"
     "@types/ssh2" "*"
 
-"@types/dockerode@^3.3.29":
-  version "3.3.35"
-  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.35.tgz#d78c844a246f8717e3bcf2cc134a976bfa630b10"
-  integrity sha512-P+DCMASlsH+QaKkDpekKrP5pLls767PPs+/LrlVbKnEnY5tMpEUa2C6U4gRsdFZengOqxdCIqy16R22Q3pLB6Q==
+"@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==
   dependencies:
     "@types/docker-modem" "*"
     "@types/node" "*"
@@ -2978,9 +3243,9 @@
     "@types/json-schema" "*"
 
 "@types/estree@*", "@types/estree@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
-  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8"
+  integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==
 
 "@types/events@^3.0.0":
   version "3.0.3"
@@ -2997,7 +3262,7 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
-"@types/express-serve-static-core@^4.17.33":
+"@types/express-serve-static-core@^4.17.21", "@types/express-serve-static-core@^4.17.33":
   version "4.19.6"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
   integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==
@@ -3008,13 +3273,12 @@
     "@types/send" "*"
 
 "@types/express@*", "@types/express@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c"
-  integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.2.tgz#7be9e337a5745d6b43ef5b0c352dad94a7f0c256"
+  integrity sha512-BtjL3ZwbCQriyb0DGw+Rt12qAXPiBTPs815lsUvtt1Grk0vLRMZNMUZ741d5rjk+UQOxfDiBZ3dxpX00vSkK3g==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^5.0.0"
-    "@types/qs" "*"
     "@types/serve-static" "*"
 
 "@types/express@^4.17.21":
@@ -3075,9 +3339,9 @@
   integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==
 
 "@types/http-proxy@^1.17.8":
-  version "1.17.15"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36"
-  integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==
+  version "1.17.16"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.16.tgz#dee360707b35b3cc85afcde89ffeebff7d7f9240"
+  integrity sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==
   dependencies:
     "@types/node" "*"
 
@@ -3122,7 +3386,7 @@
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -3143,9 +3407,9 @@
   integrity sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==
 
 "@types/lodash@^4.14.168":
-  version "4.17.16"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
-  integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==
+  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"
@@ -3191,17 +3455,17 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*":
-  version "22.13.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.10.tgz#df9ea358c5ed991266becc3109dc2dc9125d77e4"
-  integrity sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==
+"@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==
   dependencies:
-    undici-types "~6.20.0"
+    undici-types "~6.21.0"
 
 "@types/node@18", "@types/node@^18.11.18":
-  version "18.19.80"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.80.tgz#6d6008e8920dddcd23f9dd33da24684ef57d487c"
-  integrity sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==
+  version "18.19.105"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.105.tgz#44bae77ea9832da4357e1d35df37cb86927e1405"
+  integrity sha512-a+DrwD2VyzqQR2W0EVF8EaCh6Em4ilQAYLEPZnMNkQHXR7ziWW7RUhZMWZAgRpkDDAdUIcJOXSPJT/zBEwz3sA==
   dependencies:
     undici-types "~5.26.4"
 
@@ -3238,9 +3502,9 @@
     "@types/node" "*"
 
 "@types/qs@*":
-  version "6.9.18"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.18.tgz#877292caa91f7c1b213032b34626505b746624c2"
-  integrity sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.14.0.tgz#d8b60cecf62f2db0fb68e5e006077b9178b85de5"
+  integrity sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==
 
 "@types/range-parser@*":
   version "1.2.7"
@@ -3254,10 +3518,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@18.3.5":
-  version "18.3.5"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.5.tgz#45f9f87398c5dcea085b715c58ddcf1faf65f716"
-  integrity sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==
+"@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-redux@^7.1.20":
   version "7.1.34"
@@ -3282,12 +3546,11 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@18.3.18":
-  version "18.3.18"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.18.tgz#9b382c4cd32e13e463f97df07c2ee3bbcd26904b"
-  integrity sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==
+"@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:
-    "@types/prop-types" "*"
     csstype "^3.0.2"
 
 "@types/retry@0.12.0":
@@ -3300,10 +3563,10 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
   integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
 
-"@types/sanitize-html@2.13.0":
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.13.0.tgz#ac3620e867b7c68deab79c72bd117e2049cdd98e"
-  integrity sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==
+"@types/sanitize-html@2.16.0":
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.16.0.tgz#860d72c1ba8a5d044946f37559cc359c0a13b24e"
+  integrity sha512-l6rX1MUXje5ztPT0cAFtUayXF06DqPhRyfVXareEN5gGCFaP/iwsxIyKODr9XDhfxPpN6vXUFNfo5kZMXCxBtw==
   dependencies:
     htmlparser2 "^8.0.0"
 
@@ -3313,9 +3576,9 @@
   integrity sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==
 
 "@types/semver@^7.5.8":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.7.0.tgz#64c441bdae033b378b6eef7d0c3d77c329b9378e"
+  integrity sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==
 
 "@types/send@*":
   version "0.17.4"
@@ -3356,9 +3619,9 @@
     "@types/node" "*"
 
 "@types/ssh2@*":
-  version "1.15.4"
-  resolved "https://registry.yarnpkg.com/@types/ssh2/-/ssh2-1.15.4.tgz#2347d2ff079e205b077c02407d822803bfd23c45"
-  integrity sha512-9JTQgVBWSgq6mAen6PVnrAmty1lqgCMvpfN+1Ck5WRUsyMYPa6qd50/vMJ0y1zkGpOEgLzm8m8Dx/Y5vRouLaA==
+  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"
 
@@ -3403,9 +3666,9 @@
   integrity sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==
 
 "@types/ws@^8.5.10":
-  version "8.5.14"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.14.tgz#93d44b268c9127d96026cf44353725dd9b6c3c21"
-  integrity sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==
+  version "8.18.1"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.18.1.tgz#48464e4bf2ddfd17db13d845467f6070ffea4aa9"
+  integrity sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==
   dependencies:
     "@types/node" "*"
 
@@ -3422,29 +3685,38 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^8.19.0":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz#3e48eb847924161843b092c87a9b65176b53782f"
-  integrity sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==
+  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==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.26.1"
-    "@typescript-eslint/type-utils" "8.26.1"
-    "@typescript-eslint/utils" "8.26.1"
-    "@typescript-eslint/visitor-keys" "8.26.1"
+    "@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"
-    ignore "^5.3.1"
+    ignore "^7.0.0"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.0.1"
+    ts-api-utils "^2.1.0"
 
 "@typescript-eslint/parser@^8.19.0":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.26.1.tgz#0e2f915a497519fc43f52cf2ecbfa607ff56f72e"
-  integrity sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==
+  version "8.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.33.0.tgz#8e523c2b447ad7cd6ac91b719d8b37449481784d"
+  integrity sha512-JaehZvf6m0yqYp34+RVnihBAChkqeH+tqqhS0GuX1qgPpwLvmTPheKEs6OeCK6hVJgXZHJ2vbjnC9j119auStQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.26.1"
-    "@typescript-eslint/types" "8.26.1"
-    "@typescript-eslint/typescript-estree" "8.26.1"
-    "@typescript-eslint/visitor-keys" "8.26.1"
+    "@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"
+    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==
+  dependencies:
+    "@typescript-eslint/tsconfig-utils" "^8.33.0"
+    "@typescript-eslint/types" "^8.33.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@8.23.0":
@@ -3455,46 +3727,38 @@
     "@typescript-eslint/types" "8.23.0"
     "@typescript-eslint/visitor-keys" "8.23.0"
 
-"@typescript-eslint/scope-manager@8.24.1":
-  version "8.24.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz#1e1e76ec4560aa85077ab36deb9b2bead4ae124e"
-  integrity sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "8.24.1"
-    "@typescript-eslint/visitor-keys" "8.24.1"
+    "@typescript-eslint/types" "8.33.0"
+    "@typescript-eslint/visitor-keys" "8.33.0"
 
-"@typescript-eslint/scope-manager@8.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz#5e6ad0ac258ccf79462e91c3f43a3f1f7f31a6cc"
-  integrity sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==
-  dependencies:
-    "@typescript-eslint/types" "8.26.1"
-    "@typescript-eslint/visitor-keys" "8.26.1"
+"@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.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz#462f0bae09de72ac6e8e1af2ebe588c23224d7f8"
-  integrity sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==
+"@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==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.26.1"
-    "@typescript-eslint/utils" "8.26.1"
+    "@typescript-eslint/typescript-estree" "8.33.0"
+    "@typescript-eslint/utils" "8.33.0"
     debug "^4.3.4"
-    ts-api-utils "^2.0.1"
+    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.24.1":
-  version "8.24.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.24.1.tgz#8777a024f3afc4ace5e48f9a804309c6dd38f95a"
-  integrity sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==
-
-"@typescript-eslint/types@8.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.26.1.tgz#d5978721670cff263348d5062773389231a64132"
-  integrity sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==
+"@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/typescript-estree@8.23.0":
   version "8.23.0"
@@ -3510,43 +3774,31 @@
     semver "^7.6.0"
     ts-api-utils "^2.0.1"
 
-"@typescript-eslint/typescript-estree@8.24.1":
-  version "8.24.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz#3bb479401f8bd471b3c6dd3db89e7256977c54db"
-  integrity sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==
+"@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/types" "8.24.1"
-    "@typescript-eslint/visitor-keys" "8.24.1"
+    "@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"
-    ts-api-utils "^2.0.1"
+    ts-api-utils "^2.1.0"
 
-"@typescript-eslint/typescript-estree@8.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz#eb0e4ce31753683d83be53441a409fd5f0b34afd"
-  integrity sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "8.26.1"
-    "@typescript-eslint/visitor-keys" "8.26.1"
-    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/utils@8.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.26.1.tgz#54cc58469955f25577f659753b71a0e117a0539f"
-  integrity sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.26.1"
-    "@typescript-eslint/types" "8.26.1"
-    "@typescript-eslint/typescript-estree" "8.26.1"
+    "@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/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
   version "8.23.0"
@@ -3558,16 +3810,6 @@
     "@typescript-eslint/types" "8.23.0"
     "@typescript-eslint/typescript-estree" "8.23.0"
 
-"@typescript-eslint/utils@^8.13.0":
-  version "8.24.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.24.1.tgz#08d14eac33cfb3456feeee5a275b8ad3349e52ed"
-  integrity sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.24.1"
-    "@typescript-eslint/types" "8.24.1"
-    "@typescript-eslint/typescript-estree" "8.24.1"
-
 "@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"
@@ -3576,20 +3818,12 @@
     "@typescript-eslint/types" "8.23.0"
     eslint-visitor-keys "^4.2.0"
 
-"@typescript-eslint/visitor-keys@8.24.1":
-  version "8.24.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz#8bdfe47a89195344b34eb21ef61251562148202b"
-  integrity sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "8.24.1"
-    eslint-visitor-keys "^4.2.0"
-
-"@typescript-eslint/visitor-keys@8.26.1":
-  version "8.26.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz#c5267fcc82795cf10280363023837deacad2647c"
-  integrity sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==
-  dependencies:
-    "@typescript-eslint/types" "8.26.1"
+    "@typescript-eslint/types" "8.33.0"
     eslint-visitor-keys "^4.2.0"
 
 "@ungap/structured-clone@^1.2.0":
@@ -3598,14 +3832,14 @@
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
 "@vector-im/compound-design-tokens@^4.0.0":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@vector-im/compound-design-tokens/-/compound-design-tokens-4.0.1.tgz#5c4ea7ad664d8e6206dc42e41649c80ef060a760"
-  integrity sha512-V4AsK1FVFxZ6DmmCoeAi8FyvE7ODMlXPWjqRGotcnVaoGNrDQrVz2ZGV85DCz5ISxB3iynYASe6OXsDVXT1zFA==
+  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==
 
-"@vector-im/compound-web@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@vector-im/compound-web/-/compound-web-7.9.0.tgz#72eccdd501e54f7b88317ba927bfeca61af72de0"
-  integrity sha512-2rBD+1Mit+kOd7+ZPUxdH7y6V1mi7Fga85cyC2cvUeL/sXBn0Q5HuyJ8whmdgLmgZiI4LkLriCFaeogYipKE+Q==
+"@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==
   dependencies:
     "@floating-ui/react" "^0.27.0"
     "@radix-ui/react-context-menu" "^2.2.1"
@@ -3617,16 +3851,16 @@
     classnames "^2.5.1"
     vaul "^1.0.0"
 
-"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.2-3fa19a2a17fd12d955ef1e14fd63aecbcf3b95e8-integrity/node_modules/bindings/wysiwyg-wasm":
+"@vector-im/matrix-wysiwyg-wasm@link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm":
   version "0.0.0"
   uid ""
 
-"@vector-im/matrix-wysiwyg@2.38.2":
-  version "2.38.2"
-  resolved "https://registry.yarnpkg.com/@vector-im/matrix-wysiwyg/-/matrix-wysiwyg-2.38.2.tgz#3fa19a2a17fd12d955ef1e14fd63aecbcf3b95e8"
-  integrity sha512-TUnLPgZ8/zGUccQZxjIP3MVHjqybgV4u0r6kXibs35wlXgomXjwcN5gchl3FpgGkiHbi8g3D2ao0oHaqi2GaIw==
+"@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==
   dependencies:
-    "@vector-im/matrix-wysiwyg-wasm" "link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.2-3fa19a2a17fd12d955ef1e14fd63aecbcf3b95e8-integrity/node_modules/bindings/wysiwyg-wasm"
+    "@vector-im/matrix-wysiwyg-wasm" "link:../../../.cache/yarn/v6/npm-@vector-im-matrix-wysiwyg-2.38.3-cc54d8b3e9472bcd8e622126ba364ee31952cd8a-integrity/node_modules/bindings/wysiwyg-wasm"
 
 "@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
   version "1.14.1"
@@ -3808,6 +4042,14 @@ abort-controller@^3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
+accepts@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-2.0.0.tgz#bbcf4ba5075467f3f2131eab3cffc73c2f5d7895"
+  integrity sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==
+  dependencies:
+    mime-types "^3.0.0"
+    negotiator "^1.0.0"
+
 accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -3841,12 +4083,7 @@ acorn@^8.0.4, acorn@^8.1.0, acorn@^8.11.0, acorn@^8.9.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.13.0.tgz#2a30d670818ad16ddd6a35d3842dacec9e5d7ca3"
   integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==
 
-acorn@^8.14.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
-
-acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2:
+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==
@@ -3858,14 +4095,6 @@ agent-base@6:
   dependencies:
     debug "4"
 
-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-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -4236,10 +4465,10 @@ axe-core@~4.10.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
   integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
 
-axios@^1.8.1:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.4.tgz#78990bb4bc63d2cae072952d374835950a82f447"
-  integrity sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==
+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==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -4302,12 +4531,12 @@ babel-plugin-jsx-remove-data-test-id@^3.0.0:
   integrity sha512-E4uM/LIUizjy2Z5tVAfa8pSXsYgoKWJ97kzuEMfsIxSLSNDWsAhgFVPkgNuakViX5dkNjw1DKIi0VpWP6djqbw==
 
 babel-plugin-polyfill-corejs2@^0.4.10:
-  version "0.4.12"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9"
-  integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==
+  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==
   dependencies:
     "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.6.3"
+    "@babel/helper-define-polyfill-provider" "^0.6.4"
     semver "^6.3.1"
 
 babel-plugin-polyfill-corejs3@^0.11.0:
@@ -4319,11 +4548,11 @@ babel-plugin-polyfill-corejs3@^0.11.0:
     core-js-compat "^3.40.0"
 
 babel-plugin-polyfill-regenerator@^0.6.1:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8"
-  integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==
+  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==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.6.3"
+    "@babel/helper-define-polyfill-provider" "^0.6.4"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.1.0"
@@ -4364,24 +4593,24 @@ 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.0.0, bare-events@^2.2.0:
+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-fs@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.0.1.tgz#85844f34da819c76754d545323a8b23ed3617c76"
-  integrity sha512-ilQs4fm/l9eMfWY2dY0WCIUplSUp7U0CT1vrqMg1MUdeZl4fypu5UP0XcDBK5WBQPJAKP1b7XEodISmekH/CEg==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/bare-fs/-/bare-fs-4.1.5.tgz#1d06c076e68cc8bf97010d29af9e3ac3808cdcf7"
+  integrity sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==
   dependencies:
-    bare-events "^2.0.0"
+    bare-events "^2.5.4"
     bare-path "^3.0.0"
-    bare-stream "^2.0.0"
+    bare-stream "^2.6.4"
 
 bare-os@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.0.tgz#1465dd7e1bebe0dec230097a23ad00f7db51f957"
-  integrity sha512-BUrFS5TqSBdA0LwHop4OjPJwisqxGy6JsWVqV6qaFoe965qqtaKfDzHY5T2YA1gUL0ZeeQeA+4BBc1FJTcHiPw==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/bare-os/-/bare-os-3.6.1.tgz#9921f6f59edbe81afa9f56910658422c0f4858d4"
+  integrity sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==
 
 bare-path@^3.0.0:
   version "3.0.0"
@@ -4390,7 +4619,7 @@ bare-path@^3.0.0:
   dependencies:
     bare-os "^3.0.1"
 
-bare-stream@^2.0.0:
+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==
@@ -4398,9 +4627,9 @@ bare-stream@^2.0.0:
     streamx "^2.21.0"
 
 base-x@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.0.tgz#6d835ceae379130e1a4cb846a70ac4746f28ea9b"
-  integrity sha512-sMW3VGSX1QWVFA6l8U62MLKz29rRfpTlYdCqLdpLo1/Yd4zZwSbnUaDfciIAowAqvq7YFnWq9hrhdg1KYgc1lQ==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-5.0.1.tgz#16bf35254be1df8aca15e36b7c1dda74b2aa6b03"
+  integrity sha512-M7uio8Zt++eg3jPj+rHMfCC+IuygQHHCOU+IYsVtik6FWjuYpVt/+MRKcgsAMHh8mMFAwnB+Bs+mTrFiXjMzKg==
 
 base64-arraybuffer@^1.0.2:
   version "1.0.2"
@@ -4485,6 +4714,21 @@ 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==
+  dependencies:
+    bytes "^3.1.2"
+    content-type "^1.0.5"
+    debug "^4.4.0"
+    http-errors "^2.0.0"
+    iconv-lite "^0.6.3"
+    on-finished "^2.4.1"
+    qs "^6.14.0"
+    raw-body "^3.0.0"
+    type-is "^2.0.0"
+
 bonjour-service@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.3.0.tgz#80d867430b5a0da64e82a8047fc1e355bdb71722"
@@ -4521,14 +4765,14 @@ braces@^3.0.3, braces@~3.0.2:
     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.24.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
-  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
+  version "4.25.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.0.tgz#986aa9c6d87916885da2b50d8eb577ac8d133b2c"
+  integrity sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==
   dependencies:
-    caniuse-lite "^1.0.30001688"
-    electron-to-chromium "^1.5.73"
+    caniuse-lite "^1.0.30001718"
+    electron-to-chromium "^1.5.160"
     node-releases "^2.0.19"
-    update-browserslist-db "^1.1.1"
+    update-browserslist-db "^1.1.3"
 
 bs58@^6.0.0:
   version "6.0.0"
@@ -4592,20 +4836,20 @@ 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:
   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.9"
-  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-1.8.9.tgz#f5498999567ae1015761d805bd8bbecd8393fbd4"
-  integrity sha512-FicwAUyWnrtnd4QqYAoRlNs44/a1jTL7XDKqm5gJ90wz1DQPlC7U2Rd1Tydpv+E7WAr4sQHuw8Q8M3nZMAyecQ==
+  version "1.8.10"
+  resolved "https://registry.yarnpkg.com/cacheable/-/cacheable-1.8.10.tgz#c1b36260240d812912a6d3503da3a6e00166f75c"
+  integrity sha512-0ZnbicB/N2R6uziva8l6O6BieBklArWyiGx4GkwAhLKhSHyQtRfM9T1nx7HHuHDKkYB/efJQhz3QJ6x/YqoZzA==
   dependencies:
-    hookified "^1.7.1"
-    keyv "^5.3.1"
+    hookified "^1.8.1"
+    keyv "^5.3.2"
 
-call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
+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==
@@ -4613,6 +4857,14 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
+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.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"
@@ -4623,7 +4875,15 @@ 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.3:
+call-bound@^1.0.2:
+  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"
+
+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==
@@ -4669,10 +4929,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@1.0.30001704, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001688:
-  version "1.0.30001704"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz#6644fe909d924ac3a7125e8a0ab6af95b1f32990"
-  integrity sha512-+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==
+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==
 
 chalk@5.2.0:
   version "5.2.0"
@@ -4780,11 +5040,6 @@ clean-regexp@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-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==
-
 cli-cursor@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38"
@@ -4827,11 +5082,6 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
-
 clsx@^1.0.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
@@ -4893,21 +5143,16 @@ commander@^12.1.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
   integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
 
-commander@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46"
-  integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==
+commander@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.0.tgz#f244fc74a92343514e56229f16ef5c5e22ced5e9"
+  integrity sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==
 
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
 commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -4946,9 +5191,9 @@ compressible@~2.0.18:
     mime-db ">= 1.43.0 < 2"
 
 compression@^1.7.4:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
-  integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.0.tgz#09420efc96e11a0f44f3a558de59e321364180f7"
+  integrity sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==
   dependencies:
     bytes "3.1.2"
     compressible "~2.0.18"
@@ -4988,7 +5233,14 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@^1.0.4, content-type@~1.0.4, content-type@~1.0.5:
+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"
+
+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==
@@ -5003,11 +5255,21 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
+cookie-signature@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.2.2.tgz#57c7fc3cc293acab9fec54d73e15690ebe4a1793"
+  integrity sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==
+
 cookie@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9"
   integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==
 
+cookie@^0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
+
 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"
@@ -5027,16 +5289,16 @@ core-js-compat@^3.38.1:
     browserslist "^4.24.3"
 
 core-js-compat@^3.40.0:
-  version "3.41.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.41.0.tgz#4cdfce95f39a8f27759b667cf693d96e5dda3d17"
-  integrity sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==
+  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==
   dependencies:
     browserslist "^4.24.4"
 
 core-js@^3.0.0, core-js@^3.38.1:
-  version "3.41.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776"
-  integrity sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==
+  version "3.42.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37"
+  integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -5119,9 +5381,9 @@ create-require@^1.1.0:
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cronstrue@^2.41.0:
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.56.0.tgz#70b406106e6059bf9c494c788255d671d8ecc361"
-  integrity sha512-/YC3b4D/E/S8ToQ7f676A2fqoC3vVpXKjJ4SMsP0jYsvRYJdZ6h9+Fq/Y7FoFDEUFCqLTca+G2qTV227lyyFZg==
+  version "2.61.0"
+  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.61.0.tgz#97c79c77045c052afb44cb9f5f8eaf54398094f2"
+  integrity sha512-ootN5bvXbIQI9rW94+QsXN5eROtXWwew6NkdGxIRpS/UFWRggL0G5Al7a9GTBFEsuvVhJ2K3CntIIVt7L2ILhA==
 
 cross-spawn@^7.0.2:
   version "7.0.5"
@@ -5417,10 +5679,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.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==
+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==
   dependencies:
     ms "^2.1.3"
 
@@ -5438,21 +5700,28 @@ 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:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
-  integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
-
 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:
+  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.0.0:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.3.tgz#99aee19eb9bae55a67327717b6e848d0bf777e5a"
@@ -5481,13 +5750,6 @@ default-browser@^5.2.1:
     bundle-name "^4.1.0"
     default-browser-id "^5.0.0"
 
-defaults@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
-  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
-  dependencies:
-    clone "^1.0.2"
-
 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"
@@ -5516,7 +5778,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:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -5552,9 +5814,9 @@ detect-node@^2.0.4:
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 diff-dom@^5.0.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-5.1.4.tgz#20d0f6e39558f59dae0e2943b69360fc15e371cb"
-  integrity sha512-TSEaVdVGictY1KHg7VpVw2nuM02YKC9C8/qBkGiCnkiAybVbu1zQTMj2/dnVLRO7Z62UsqzHGpXweiOj5/jaZg==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/diff-dom/-/diff-dom-5.2.0.tgz#bc6756e0dca58bc7565579daf566ce6b259821bf"
+  integrity sha512-+FEFvDJljxPBz9ddkxCpn7I/5SFFYYfvqcS63zE+Aw+3TgTyHAI1RGXEBGLfrkbVQTYCSpvc0nxNNMyNBA60tQ==
 
 diff-match-patch@^1.0.5:
   version "1.0.5"
@@ -5590,31 +5852,35 @@ dns-packet@^5.2.2:
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
-docker-compose@^0.24.8:
-  version "0.24.8"
-  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.24.8.tgz#6c125e6b9e04cf68ced47e2596ef2bb93ee9694e"
-  integrity sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==
+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==
   dependencies:
     yaml "^2.2.2"
 
-docker-modem@^3.0.0:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/docker-modem/-/docker-modem-3.0.8.tgz#ef62c8bdff6e8a7d12f0160988c295ea8705e77a"
-  integrity sha512-f0ReSURdM3pcKPNS30mxOHSbaFLcknGmQjwSfmbcdOw1XWKXVhukM3NJHhr7NpY9BIyyWQb0EBo3KQvvuU5egQ==
+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.11.0"
+    ssh2 "^1.15.0"
 
-dockerode@^3.3.5:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.5.tgz#7ae3f40f2bec53ae5e9a741ce655fff459745629"
-  integrity sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==
+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==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
-    docker-modem "^3.0.0"
-    tar-fs "~2.0.1"
+    "@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"
+    uuid "^10.0.0"
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -5726,9 +5992,9 @@ dot-case@^3.0.4:
     tslib "^2.0.3"
 
 dotenv@^16.0.2, dotenv@^16.3.1:
-  version "16.4.7"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26"
-  integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
+  version "16.5.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.5.0.tgz#092b49f25f808f020050051d1ff258e404c78692"
+  integrity sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==
 
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
@@ -5754,15 +6020,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-easy-table@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/easy-table/-/easy-table-1.2.0.tgz#ba9225d7138fee307bfd4f0b5bc3c04bdc7c54eb"
-  integrity sha512-OFzVOv03YpvtcWGe5AayU5G2hgybsg3iqA6drU8UaoZyB9jLGMTrz9+asnLp/E+6qPh88yEI1gvyZFZ41dmgww==
-  dependencies:
-    ansi-regex "^5.0.1"
-  optionalDependencies:
-    wcwidth "^1.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5775,10 +6032,10 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.5.73:
-  version "1.5.120"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.120.tgz#ccfdd28e9795fb8c2221cefa2c9a071501c86247"
-  integrity sha512-oTUp3gfX1gZI+xfD2djr2rzQdHCwHzPQrrK0CD7WpTdF0nPdQ/INcRVjWgLdCT4a9W3jFObR9DAfsuyFQnI8CQ==
+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==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -5820,16 +6077,16 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+encodeurl@^2.0.0, encodeurl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encodeurl@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
-  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
-
 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"
@@ -5837,7 +6094,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.17.1, enhanced-resolve@^5.18.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==
@@ -5977,11 +6234,11 @@ es-iterator-helpers@^1.2.1:
     safe-array-concat "^1.1.3"
 
 es-module-lexer@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21"
-  integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz#9159601561880a85f2734560a9099b2c31e5372a"
+  integrity sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==
 
-es-object-atoms@^1.0.0:
+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==
@@ -6056,9 +6313,9 @@ eslint-config-google@^0.14.0:
   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
 
 eslint-config-prettier@^10.0.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.1.1.tgz#cf0ff6e5c4e7e15f129f1f1ce2a5ecba92dec132"
-  integrity sha512-4EQQr6wXwS+ZJSzaR5ZCrYgLxqvUjdXctaEtBqHcbkW944B1NQyO4qpdHQbXBONfwxXdkAY81HH4+LUfrg+zPw==
+  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==
 
 eslint-import-resolver-node@^0.3.9:
   version "0.3.9"
@@ -6334,7 +6591,7 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-etag@~1.8.1:
+etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
@@ -6381,21 +6638,6 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
-  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^8.0.1"
-    human-signals "^5.0.0"
-    is-stream "^3.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^5.1.0"
-    onetime "^6.0.0"
-    signal-exit "^4.1.0"
-    strip-final-newline "^3.0.0"
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -6412,7 +6654,7 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-express@^4.18.2, express@^4.21.2:
+express@^4.21.2:
   version "4.21.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
   integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
@@ -6449,15 +6691,48 @@ express@^4.18.2, express@^4.21.2:
     utils-merge "1.0.1"
     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==
+  dependencies:
+    accepts "^2.0.0"
+    body-parser "^2.2.0"
+    content-disposition "^1.0.0"
+    content-type "^1.0.5"
+    cookie "^0.7.1"
+    cookie-signature "^1.2.1"
+    debug "^4.4.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    finalhandler "^2.1.0"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    merge-descriptors "^2.0.0"
+    mime-types "^3.0.0"
+    on-finished "^2.4.1"
+    once "^1.4.0"
+    parseurl "^1.3.3"
+    proxy-addr "^2.0.7"
+    qs "^6.14.0"
+    range-parser "^1.2.1"
+    router "^2.2.0"
+    send "^1.1.0"
+    serve-static "^2.2.0"
+    statuses "^2.0.1"
+    type-is "^2.0.1"
+    vary "^1.1.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.0"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-6.0.0.tgz#3173d5ad141436dace95f8de6e9ecdc3d9787d5d"
-  integrity sha512-YEboHE5VfopUclOck7LncgIqskAqnv4q0EWbYCaxKKjAvO93c+TJIaBuGy8CBFdbg9nKdpN3AuPRwVBJ4k7NrQ==
+  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==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
@@ -6500,7 +6775,7 @@ fastest-levenshtein@1.0.16, fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
-fastq@^1.15.0, fastq@^1.6.0:
+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==
@@ -6521,6 +6796,13 @@ fb-watchman@^2.0.0:
   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==
+  dependencies:
+    walk-up-path "^3.0.1"
+
 fdir@^6.4.0:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
@@ -6559,12 +6841,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.7:
-  version "10.0.7"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-10.0.7.tgz#e0ac34d4b8c44bea8a0a27ceb4dae982f2d32749"
-  integrity sha512-txsf5fu3anp2ff3+gOJJzRImtrtm/oa9tYLN0iTuINZ++EyVR/nRrg2fKYwvG/pXDofcrvvb0scEbX3NyW/COw==
+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==
   dependencies:
-    flat-cache "^6.1.7"
+    flat-cache "^6.1.8"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
@@ -6623,6 +6905,18 @@ finalhandler@1.3.1:
     statuses "2.0.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==
+  dependencies:
+    debug "^4.4.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    on-finished "^2.4.1"
+    parseurl "^1.3.3"
+    statuses "^2.0.1"
+
 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"
@@ -6655,14 +6949,14 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat-cache@^6.1.7:
-  version "6.1.7"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-6.1.7.tgz#c04b08316739ad7ef997e1b9ea363443fc2fcb38"
-  integrity sha512-qwZ4xf1v1m7Rc9XiORly31YaChvKt6oNVHuqqZcoED/7O+ToyNVGobKsIAopY9ODcWpEDKEBAbrSOCBHtNQvew==
+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==
   dependencies:
     cacheable "^1.8.9"
     flatted "^3.3.3"
-    hookified "^1.7.1"
+    hookified "^1.8.1"
 
 flat@^5.0.2:
   version "5.0.2"
@@ -6721,6 +7015,13 @@ form-data@^4.0.0:
     es-set-tostringtag "^2.1.0"
     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==
+  dependencies:
+    fd-package-json "^1.2.0"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -6736,6 +7037,11 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
+fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-2.0.0.tgz#8dd7df6a1b3a1b3a5cf186c05a5dd267622635a4"
+  integrity sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -6813,7 +7119,7 @@ get-east-asian-width@^1.0.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-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7:
+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==
@@ -6829,6 +7135,22 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
+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-nonce@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"
@@ -6839,10 +7161,10 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-port@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
-  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+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.0, get-proto@^1.0.1:
   version "1.0.1"
@@ -6857,11 +7179,6 @@ get-stream@^6.0.0, get-stream@^6.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-stream@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
-  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
-
 get-symbol-description@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
@@ -6913,9 +7230,9 @@ glob@^10.0.0:
     path-scurry "^1.11.1"
 
 glob@^11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.1.tgz#1c3aef9a59d680e611b53dcd24bb8639cef064d9"
-  integrity sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.2.tgz#3261e3897bbc603030b041fd77ba636022d51ce0"
+  integrity sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^4.0.1"
@@ -7117,10 +7434,10 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   dependencies:
     react-is "^16.7.0"
 
-hookified@^1.7.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/hookified/-/hookified-1.8.1.tgz#74a8c97d36e5f8004d230ee2156a607cc84c358c"
-  integrity sha512-GrO2l93P8xCWBSTBX9l2BxI78VU/MAAYag+pG8curS3aBGy0++ZlxrQ7PdUOUVMbn5BwkGb6+eRrnf43ipnFEA==
+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==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
@@ -7137,10 +7454,10 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-dom-parser@5.0.13:
-  version "5.0.13"
-  resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-5.0.13.tgz#36b25b3ad05dc71741e9cd200ff276cdf8e3831d"
-  integrity sha512-B7JonBuAfG32I7fDouUQEogBrz3jK9gAuN1r1AaXpED6dIhtg/JwiSRhjGL7aOJwRz3HU4efowCjQBaoXiREqg==
+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==
   dependencies:
     domhandler "5.0.3"
     htmlparser2 "10.0.0"
@@ -7153,9 +7470,9 @@ html-encoding-sniffer@^3.0.0:
     whatwg-encoding "^2.0.0"
 
 html-entities@^2.0.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
-  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.6.0.tgz#7c64f1ea3b36818ccae3d3fb48b6974208e984f8"
+  integrity sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==
 
 html-escaper@^2.0.0, html-escaper@^2.0.2:
   version "2.0.2"
@@ -7176,12 +7493,12 @@ html-minifier-terser@^6.0.2:
     terser "^5.10.0"
 
 html-react-parser@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.2.2.tgz#a4159c14f08c06280ff793ce35f872c2283227cb"
-  integrity sha512-yA5012CJGSFWYZsgYzfr6HXJgDap38/AEP4ra8Cw+WHIi2ZRDXRX/QVYdumRf1P8zKyScKd6YOrWYvVEiPfGKg==
+  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==
   dependencies:
     domhandler "5.0.3"
-    html-dom-parser "5.0.13"
+    html-dom-parser "5.1.1"
     react-property "2.0.2"
     style-to-js "1.1.16"
 
@@ -7236,7 +7553,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==
@@ -7272,9 +7589,9 @@ http-proxy-agent@^5.0.0:
     debug "4"
 
 http-proxy-middleware@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
-  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
+  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==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -7304,11 +7621,6 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-human-signals@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
-  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
-
 husky@^9.0.0:
   version "9.1.7"
   resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d"
@@ -7343,15 +7655,15 @@ ieee754@^1.1.12, ieee754@^1.1.13, ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.8, ignore@^5.2.0, ignore@^5.3.1:
+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==
 
-ignore@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.3.tgz#397ef9315dfe0595671eefe8b633fec6943ab733"
-  integrity sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==
+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==
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -7701,6 +8013,11 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-promise@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
+  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
+
 is-regex@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
@@ -7728,11 +8045,6 @@ 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-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
-  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
-
 is-string@^1.0.7, is-string@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
@@ -7903,9 +8215,9 @@ jackspeak@^3.1.2:
     "@pkgjs/parseargs" "^0.11.0"
 
 jackspeak@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.0.2.tgz#11f9468a3730c6ff6f56823a820d7e3be9bef015"
-  integrity sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.0.tgz#c489c079f2b636dc4cbe9b0312a13ff1282e561b"
+  integrity sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
 
@@ -8498,9 +8810,9 @@ jwt-decode@4.0.0, jwt-decode@^4.0.0:
   integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
 
 katex@^0.16.0:
-  version "0.16.21"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.21.tgz#8f63c659e931b210139691f2cc7bb35166b792a3"
-  integrity sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==
+  version "0.16.22"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.22.tgz#d2b3d66464b1e6d69e6463b28a86ced5a02c5ccd"
+  integrity sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==
   dependencies:
     commander "^8.3.0"
 
@@ -8516,10 +8828,10 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-keyv@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.3.2.tgz#32edd461b51d44d42926eb72946236d79c71ae78"
-  integrity sha512-Lji2XRxqqa5Wg+CHLVfFKBImfJZ4pCSccu9eVWK6w4c2SDFLd8JAn1zqTuSFnsxb7ope6rMsnIHfp+eBbRBRZQ==
+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==
   dependencies:
     "@keyv/serialize" "^1.0.3"
 
@@ -8541,31 +8853,28 @@ kleur@^3.0.3:
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 knip@^5.36.2:
-  version "5.46.0"
-  resolved "https://registry.yarnpkg.com/knip/-/knip-5.46.0.tgz#8444881f9382901b4022775ba99e2df4de1df991"
-  integrity sha512-WedHSK5xNBWYgm64Rt5B9b0CVXL2kRBcyCeet3NHgdv9en3QE4AWSDPEiX48NoPUBW3h//9S0VwLF5MG/MPi3g==
+  version "5.59.0"
+  resolved "https://registry.yarnpkg.com/knip/-/knip-5.59.0.tgz#f2f035d06f68b42fef7555c9ff800262c63572f7"
+  integrity sha512-fpkvLIcw2xqcisJpFZRt/BG2rol1znSwzUB5AR6uj+tTgurC1iUEudx8mSlaxsLaeWx5zvHmlW0dlfq7CfKWJQ==
   dependencies:
-    "@nodelib/fs.walk" "3.0.1"
-    "@snyk/github-codeowners" "1.1.0"
-    easy-table "1.2.0"
-    enhanced-resolve "^5.18.0"
+    "@nodelib/fs.walk" "^1.2.3"
     fast-glob "^3.3.3"
+    formatly "^0.2.3"
     jiti "^2.4.2"
     js-yaml "^4.1.0"
     minimist "^1.2.8"
+    oxc-resolver "^9.0.2"
     picocolors "^1.1.0"
     picomatch "^4.0.1"
-    pretty-ms "^9.0.0"
     smol-toml "^1.3.1"
     strip-json-comments "5.0.1"
-    summary "2.1.0"
     zod "^3.22.4"
     zod-validation-error "^3.0.3"
 
-known-css-properties@^0.35.0:
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.35.0.tgz#f6f8e40ab4e5700fa32f5b2ef5218a56bc853bd6"
-  integrity sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==
+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==
 
 language-subtag-registry@^0.3.20:
   version "0.3.23"
@@ -8580,9 +8889,9 @@ language-tags@^1.0.9:
     language-subtag-registry "^0.3.20"
 
 launch-editor@^2.6.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047"
-  integrity sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.10.0.tgz#5ca3edfcb9667df1e8721310f3a40f1127d4bc42"
+  integrity sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==
   dependencies:
     picocolors "^1.0.0"
     shell-quote "^1.8.1"
@@ -8631,41 +8940,41 @@ linkify-it@^4.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-react@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-react/-/linkify-react-4.2.0.tgz#d143b2af8efa5e3b09517b66ed442624c3e06bcf"
-  integrity sha512-dIcDGo+n4FP2FPIHDcqB7cUE+omkcEgQJpc7sNNP4+XZ9FUhFAkKjGnHMzsZM+B4yF93sK166z9K5cKTe/JpzA==
+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-string@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.2.0.tgz#e8c5a9d57698e81e7cce7f4915ddbcbde17134c0"
-  integrity sha512-LqOKk0+RlqibFkxjPAGOL7Mfssqj6/SdG9QWGvzeVDpoWXhaw9OXxseCtFanjIl7C6UyTTZizhyGr4IWLfijiw==
+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==
 
-linkifyjs@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.2.0.tgz#9dd30222b9cbabec9c950e725ec00031c7fa3f08"
-  integrity sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==
+linkifyjs@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.3.1.tgz#1f246ebf4be040002accd1f4535b6af7c7e37898"
+  integrity sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==
 
-lint-staged@^15.0.2:
-  version "15.5.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.5.0.tgz#fa6464cfb06e0faf5bb167f83186e952ff6e569e"
-  integrity sha512-WyCzSbfYGhK7cU+UuDDkzUiytbfbi0ZdPy2orwtM75P3WTtQBzmG40cCxIa8Ii2+XjfxzLH6Be46tUfWS85Xfg==
+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==
   dependencies:
     chalk "^5.4.1"
-    commander "^13.1.0"
-    debug "^4.4.0"
-    execa "^8.0.1"
+    commander "^14.0.0"
+    debug "^4.4.1"
     lilconfig "^3.1.3"
-    listr2 "^8.2.5"
+    listr2 "^8.3.3"
     micromatch "^4.0.8"
+    nano-spawn "^1.0.2"
     pidtree "^0.6.0"
     string-argv "^0.3.2"
-    yaml "^2.7.0"
+    yaml "^2.8.0"
 
-listr2@^8.2.5:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.5.tgz#5c9db996e1afeb05db0448196d3d5f64fec2593d"
-  integrity sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==
+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==
   dependencies:
     cli-truncate "^4.0.0"
     colorette "^2.0.20"
@@ -8707,6 +9016,11 @@ lodash-es@^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.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -8758,17 +9072,22 @@ log-update@^6.1.0:
     strip-ansi "^7.1.0"
     wrap-ansi "^9.0.0"
 
-loglevel@^1.7.1:
+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==
+
 long@^5.2.0:
   version "5.2.3"
   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.1.0, loose-envify@^1.4.0:
+loose-envify@^1.0.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==
@@ -8788,9 +9107,9 @@ lru-cache@^10.2.0:
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
 lru-cache@^11.0.0:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.0.2.tgz#fbd8e7cf8211f5e7e5d91905c415a3f55755ca39"
-  integrity sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==
+  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==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -8812,11 +9131,11 @@ magic-string@0.30.8:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
 mailpit-api@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mailpit-api/-/mailpit-api-1.2.0.tgz#6cbd7c5c091fd74b000385790a1fe0c9f2a83fba"
-  integrity sha512-oni/IwQhtbwk3ERwJ6IarKIFgz2U5684SK6Bbkau2GBo2FLoiT14UGkL3CXleYPBH5SCsnymHap1eevEOLwqaA==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/mailpit-api/-/mailpit-api-1.4.0.tgz#881b473434b86c13ff85c3d92e9474daf4376135"
+  integrity sha512-A7hMRDQGo0jf1HZM06tw8dSgT2cYEev7lh1ehUXDWIBWXuK+Rq6HHCCQz624uAFYWEngmt4RGG1kMGGUC7iY6A==
   dependencies:
-    axios "^1.8.1"
+    axios "^1.9.0"
 
 make-dir@^4.0.0:
   version "4.0.0"
@@ -8838,9 +9157,9 @@ makeerror@1.0.12:
     tmpl "1.0.5"
 
 maplibre-gl@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.2.0.tgz#e3cdb66c82232cffbe149b032776484722caee4e"
-  integrity sha512-9zZKD0M80qtDsqBet+EDuAhoCeA/cnAuZAA0p3hcGKGbyjM/SH+R6wQvnBEgvJz9UhDynnkoKdUwhI+fUkHoXQ==
+  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==
   dependencies:
     "@mapbox/geojson-rewind" "^0.5.2"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
@@ -8849,7 +9168,7 @@ maplibre-gl@^5.0.0:
     "@mapbox/unitbezier" "^0.0.1"
     "@mapbox/vector-tile" "^1.3.1"
     "@mapbox/whoots-js" "^3.1.0"
-    "@maplibre/maplibre-gl-style-spec" "^23.1.0"
+    "@maplibre/maplibre-gl-style-spec" "^23.2.2"
     "@types/geojson" "^7946.0.16"
     "@types/geojson-vt" "3.2.5"
     "@types/mapbox__point-geometry" "^0.1.4"
@@ -8900,19 +9219,19 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-matrix-js-sdk@37.3.0:
-  version "37.3.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.3.0.tgz#8e08d6311cd4d1de60163cedddf353b1fbe5e0ce"
-  integrity sha512-uYpXEucA+y9b116Hn+zG+X+u2GE2dACh+aN0BhiJDL/LtvhQgrXT4ZLG/N7OizomoHHF+i/WetDhi+rzDJQdDw==
+matrix-js-sdk@37.9.0:
+  version "37.9.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.9.0.tgz#f56dcb47ae5324a719d279a29278f28e43d2b234"
+  integrity sha512-a4p/2XM7kOQsguOjzsnbmBajxLRJewlOG1KB6HfErUKWR4GKwZEfJ3oHeWUHRdE/IYLdUQzIAwFdvCFK08pOww==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^14.0.1"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^14.2.0"
     "@matrix-org/olm" "3.2.15"
     another-json "^0.2.0"
     bs58 "^6.0.0"
     content-type "^1.0.4"
     jwt-decode "^4.0.0"
-    loglevel "^1.7.1"
+    loglevel "^1.9.2"
     matrix-events-sdk "0.0.1"
     matrix-widget-api "^1.10.0"
     oidc-client-ts "^3.0.1"
@@ -8955,10 +9274,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.15.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.17.0.tgz#6978ea53c38228a6cb2dae71bff652bc02ce5585"
-  integrity sha512-VT5LJBdLRI+cc3DPXJD89PGwI8yXuciE5gZJoSPnH4yeGzMPqxwkZv3BjFSoaWpmOlJNBhVT6HKeQPcZKlNEvA==
+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==
 
 mdurl@^1.0.1, mdurl@~1.0.1:
   version "1.0.1"
@@ -8970,6 +9289,11 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
+media-typer@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-1.1.0.tgz#6ab74b8f2d3320f2064b2a87a38e7931ff3a5561"
+  integrity sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==
+
 memfs@^4.6.0:
   version "4.17.0"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.17.0.tgz#a3c4b5490b9b1e7df5d433adc163e08208ce7ca2"
@@ -9000,6 +9324,11 @@ merge-descriptors@1.0.3:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
   integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
 
+merge-descriptors@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-2.0.0.tgz#ea922f660635a2249ee565e0449f951e6b603808"
+  integrity sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -9028,10 +9357,10 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-"mime-db@>= 1.43.0 < 2":
-  version "1.53.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
-  integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
+"mime-db@>= 1.43.0 < 2", mime-db@^1.54.0:
+  version "1.54.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
+  integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
 
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
@@ -9040,26 +9369,28 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17,
   dependencies:
     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==
+  dependencies:
+    mime-db "^1.54.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-4.0.6.tgz#ca83bec0bcf2a02353d0e02da99be05603d04839"
-  integrity sha512-4rGt7rvQHBbaSOF9POGkk1ocRP16Md1x36Xma8sz8h8/vfCUI2OtEIeCqe4Ofes853x4xDoPiFLIT47J5fI/7A==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-4.0.7.tgz#0b7a98b08c63bd3c10251e797d67840c9bde9f13"
+  integrity sha512-2OfDPL+e03E0LrXaGYOtTFIYhiuzep94NSsuhrNULq+stylcJedcHdzHtz0atMUuGwJfFYs0YL5xeC/Ca2x0eQ==
 
 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==
 
-mimic-fn@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
-  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
-
 mimic-function@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
@@ -9203,15 +9534,20 @@ nan@^2.19.0, nan@^2.20.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.2.tgz#6b504fd029fb8f38c0990e52ad5c26772fdacfbb"
   integrity sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==
 
+nano-spawn@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-1.0.2.tgz#9853795681f0e96ef6f39104c2e4347b6ba79bf6"
+  integrity sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg==
+
 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.10"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.10.tgz#7bc882237698ef787d5cbba109e3b0168ba6e7b1"
-  integrity sha512-vSJJTG+t/dIKAUhUDw/dLdZ9s//5OxcHqLaDWWrW4Cdq7o6tdLIczUkMXt2MBNmk6sJRZBZRXVixs7URY1CmIg==
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -9223,6 +9559,11 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+negotiator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
+  integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
+
 negotiator@~0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
@@ -9290,13 +9631,6 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npm-run-path@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
-  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
-  dependencies:
-    path-key "^4.0.0"
-
 nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -9315,9 +9649,9 @@ object-assign@^4.1.1:
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.13.3:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
-  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -9388,10 +9722,10 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-oidc-client-ts@3.2.0, oidc-client-ts@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.2.0.tgz#37e6e563bfeabc4aa1497a9a963f8e3d73168316"
-  integrity sha512-wUvVcG3SXzZDKHxi/VGQGaTUk9qguMKfYh26Y1zOVrQsu1zp85JWx/SjZzKSXK5j3NA1RcasgMoaHe6gt1WNtw==
+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==
   dependencies:
     jwt-decode "^4.0.0"
 
@@ -9421,13 +9755,6 @@ onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-onetime@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
-  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
-  dependencies:
-    mimic-fn "^4.0.0"
-
 onetime@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60"
@@ -9489,6 +9816,25 @@ 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==
+  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"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -9517,13 +9863,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-retry@4:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -9586,11 +9925,6 @@ parse-json@^5.0.0, parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse-ms@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-4.0.0.tgz#c0c058edd47c2a590151a718990533fd62803df4"
-  integrity sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==
-
 parse-srcset@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
@@ -9603,7 +9937,7 @@ parse5@^7.0.0, parse5@^7.1.1:
   dependencies:
     entities "^4.5.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+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"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -9652,11 +9986,6 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-key@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
-  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
-
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -9688,6 +10017,11 @@ path-to-regexp@^2.2.1:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
   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==
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -9738,17 +10072,17 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-playwright-core@1.51.1, playwright-core@^1.51.0:
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.51.1.tgz#d57f0393e02416f32a47cf82b27533656a8acce1"
-  integrity sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==
+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@1.51.1:
-  version "1.51.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.51.1.tgz#ae1467ee318083968ad28d6990db59f47a55390f"
-  integrity sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==
+playwright@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.52.0.tgz#26cb9a63346651e1c54c8805acfd85683173d4bd"
+  integrity sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==
   dependencies:
-    playwright-core "1.51.1"
+    playwright-core "1.52.0"
   optionalDependencies:
     fsevents "2.3.2"
 
@@ -10402,14 +10736,15 @@ postcss@^8.4.40, postcss@^8.5.3:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-posthog-js@1.157.2:
-  version "1.157.2"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.157.2.tgz#dc2515818ead408aefb900e90c535fb57beb1f59"
-  integrity sha512-ATYKGs+Q51u26nHHhrhWNh1whqFm7j/rwQQYw+y6/YzNmRlo+YsqrGZji9nqXb9/4fo0ModDr+ZmuOI3hKkUXA==
+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==
   dependencies:
+    core-js "^3.38.1"
     fflate "^0.4.8"
     preact "^10.19.3"
-    web-vitals "^4.0.1"
+    web-vitals "^4.2.4"
 
 potpack@^2.0.0:
   version "2.0.0"
@@ -10462,13 +10797,6 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-pretty-ms@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-9.2.0.tgz#e14c0aad6493b69ed63114442a84133d7e560ef0"
-  integrity sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==
-  dependencies:
-    parse-ms "^4.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"
@@ -10517,12 +10845,30 @@ 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==
+  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"
+
 protocol-buffers-schema@^3.3.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03"
   integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==
 
-proxy-addr@~2.0.7:
+proxy-addr@^2.0.7, proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -10586,6 +10932,13 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
+qs@^6.14.0:
+  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"
+
 querystring@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
@@ -10633,6 +10986,16 @@ 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==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.6.3"
+    unpipe "1.0.0"
+
 raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
@@ -10671,13 +11034,12 @@ react-clientside-effect@^1.2.7:
   dependencies:
     "@babel/runtime" "^7.12.13"
 
-react-dom@^18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
-  integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
+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==
   dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.2"
+    scheduler "^0.26.0"
 
 react-focus-lock@^2.5.1:
   version "2.13.6"
@@ -10691,21 +11053,21 @@ 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@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1, react-is@^17.0.2:
+react-is@^17.0.2:
   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.0.0:
-  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-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"
@@ -10783,12 +11145,10 @@ react-virtualized@^9.22.5:
     prop-types "^15.7.2"
     react-lifecycles-compat "^3.0.4"
 
-react@^18.3.1:
-  version "18.3.1"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
-  integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
-  dependencies:
-    loose-envify "^1.1.0"
+react@^19.0.0:
+  version "19.1.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.1.0.tgz#926864b6c48da7627f004795d6cce50e90793b75"
+  integrity sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -10921,18 +11281,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
-  integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
-
-regenerator-transform@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
-  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
 regexp-tree@^0.1.27:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
@@ -11133,12 +11481,23 @@ rimraf@^6.0.0:
     glob "^11.0.0"
     package-json-from-dist "^1.0.0"
 
+router@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/router/-/router-2.2.0.tgz#019be620b711c87641167cc79b99090f00b146ef"
+  integrity sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==
+  dependencies:
+    debug "^4.4.0"
+    depd "^2.0.0"
+    is-promise "^4.0.0"
+    parseurl "^1.3.3"
+    path-to-regexp "^8.0.0"
+
 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==
 
-run-parallel@^1.1.9, run-parallel@^1.2.0:
+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==
@@ -11207,10 +11566,10 @@ sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sanitize-html@2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.14.0.tgz#bd2a7b97ee1d86a7f0e0babf3a4468f639c3a429"
-  integrity sha512-CafX+IUPxZshXqqRaG9ZClSlfPVjSxI0td7n07hk8QO2oO+9JDnlcL8iM8TWeOXOIBFgIOx6zioTzM53AOMn3g==
+sanitize-html@2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.17.0.tgz#a8f66420a6be981d8fe412e3397cc753782598e4"
+  integrity sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -11226,12 +11585,10 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-scheduler@^0.23.2:
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
-  integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
-  dependencies:
-    loose-envify "^1.1.0"
+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==
 
 schema-utils@^3.0.0:
   version "3.3.0"
@@ -11242,7 +11599,7 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-schema-utils@^4.0.0, schema-utils@^4.2.0, schema-utils@^4.3.0:
+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==
@@ -11252,6 +11609,16 @@ schema-utils@^4.0.0, schema-utils@^4.2.0, schema-utils@^4.3.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
+schema-utils@^4.3.0, schema-utils@^4.3.2:
+  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"
@@ -11286,9 +11653,9 @@ semver@^6.3.0, semver@^6.3.1:
   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.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
-  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
 
 send@0.19.0:
   version "0.19.0"
@@ -11309,6 +11676,23 @@ send@0.19.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
+send@^1.1.0, send@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-1.2.0.tgz#32a7554fb777b831dfa828370f773a3808d37212"
+  integrity sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==
+  dependencies:
+    debug "^4.3.5"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    mime-types "^3.0.1"
+    ms "^2.1.3"
+    on-finished "^2.4.1"
+    range-parser "^1.2.1"
+    statuses "^2.0.1"
+
 serialize-javascript@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
@@ -11339,6 +11723,16 @@ serve-static@1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
+serve-static@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.2.0.tgz#9c02564ee259bdd2251b82d659a2e7e1938d66f9"
+  integrity sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==
+  dependencies:
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    parseurl "^1.3.3"
+    send "^1.2.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -11514,9 +11908,9 @@ slice-ansi@^7.1.0:
     is-fullwidth-code-point "^5.0.0"
 
 smol-toml@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/smol-toml/-/smol-toml-1.3.1.tgz#d9084a9e212142e3cab27ef4e2b8e8ba620bfe15"
-  integrity sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/smol-toml/-/smol-toml-1.3.4.tgz#4ec76e0e709f586bc50ba30eb79024173c2b2221"
+  integrity sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==
 
 snake-case@^3.0.4:
   version "3.0.4"
@@ -11641,7 +12035,7 @@ ssh-remote-port-forward@^1.0.4:
     "@types/ssh2" "^0.5.48"
     ssh2 "^1.4.0"
 
-ssh2@^1.11.0, 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==
@@ -11659,7 +12053,7 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-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==
@@ -11846,11 +12240,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-final-newline@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
-  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -11890,27 +12279,27 @@ stylehacks@^7.0.4:
     browserslist "^4.23.3"
     postcss-selector-parser "^6.1.2"
 
-stylelint-config-recommended@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-15.0.0.tgz#93d48db401215708b724f078533864e52085a07b"
-  integrity sha512-9LejMFsat7L+NXttdHdTq94byn25TD+82bzGRiV1Pgasl99pWnwipXS5DguTpp3nP1XjvLXVnEJIuYBfsRjRkA==
+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@^37.0.0:
-  version "37.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-37.0.0.tgz#55e75c7215d5398b096d2f75af6a16693c18532d"
-  integrity sha512-+6eBlbSTrOn/il2RlV0zYGQwRTkr+WtzuVSs1reaWGObxnxLpbcspCUYajVQHonVfxVw2U+h42azGhrBvcg8OA==
+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 "^15.0.0"
+    stylelint-config-recommended "^16.0.0"
 
 stylelint-scss@^6.0.0:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-6.11.1.tgz#03860aab250112825b2deb77ca7ff1e2ba3a5414"
-  integrity sha512-e4rYo0UY+BIMtGeGanghrvHTjcryxgZbyFxUedp8dLFqC4P70aawNdYjRrQxbnKhu3BNr4+lt5e/53tcKXiwFA==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-6.12.0.tgz#38cf41c3b8a76f34cd7267e4c30e7e66d35619c2"
+  integrity sha512-U7CKhi1YNkM1pXUXl/GMUXi8xKdhl4Ayxdyceie1nZ1XNIdaUgMV6OArpooWcDzEggwgYD0HP/xIgVJo9a655w==
   dependencies:
     css-tree "^3.0.1"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.35.0"
-    mdn-data "^2.15.0"
+    known-css-properties "^0.36.0"
+    mdn-data "^2.21.0"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.6"
     postcss-selector-parser "^7.1.0"
@@ -11925,9 +12314,9 @@ stylelint-value-no-unknown-custom-properties@^6.0.1:
     resolve "^1.22.8"
 
 stylelint@^16.13.0:
-  version "16.16.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.16.0.tgz#ebecf27becd277aaf752e75de324023a1e13e486"
-  integrity sha512-40X5UOb/0CEFnZVEHyN260HlSSUxPES+arrUphOumGWgXERHfwCD0kNBVILgQSij8iliYVwlc0V7M5bcLP9vPg==
+  version "16.19.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-16.19.1.tgz#486b95fa7518a3077ee2802bc6dda2174bc097bb"
+  integrity sha512-C1SlPZNMKl+d/C867ZdCRthrS+6KuZ3AoGW113RZCOL0M8xOGpgx7G70wq7lFvqvm4dcfdGFVLB/mNaLFChRKw==
   dependencies:
     "@csstools/css-parser-algorithms" "^3.0.4"
     "@csstools/css-tokenizer" "^3.0.3"
@@ -11942,7 +12331,7 @@ stylelint@^16.13.0:
     debug "^4.3.7"
     fast-glob "^3.3.3"
     fastest-levenshtein "^1.0.16"
-    file-entry-cache "^10.0.7"
+    file-entry-cache "^10.0.8"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
@@ -11950,7 +12339,7 @@ stylelint@^16.13.0:
     ignore "^7.0.3"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.35.0"
+    known-css-properties "^0.36.0"
     mathml-tag-names "^2.1.3"
     meow "^13.2.0"
     micromatch "^4.0.8"
@@ -11973,11 +12362,6 @@ sugarss@^4.0.1:
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-4.0.1.tgz#128a783ed71ee0fc3b489ce1f7d5a89bc1e24383"
   integrity sha512-WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw==
 
-summary@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/summary/-/summary-2.1.0.tgz#be8a49a0aa34eb6ceea56042cae88f8add4b0885"
-  integrity sha512-nMIjMrd5Z2nuB2RZCKJfFMjgS3fygbeyGk9PxPPaJR1RIcyN9yn4A63Isovzm3ZtQuEkLBVgMdPup8UeLH7aQw==
-
 supercluster@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5"
@@ -12063,15 +12447,20 @@ table@^6.9.0:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
+tapable@^2.0.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar-fs@^3.0.6:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.8.tgz#8f62012537d5ff89252d01e48690dc4ebed33ab7"
-  integrity sha512-ZoROL70jptorGAlgAYiLoBLItEKw/fUxg9BSYK/dF/GAGYFJOJJJMvjPAKDJraCXFwadD456FCuvLWgfhMsPwg==
+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@^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==
   dependencies:
     pump "^3.0.0"
     tar-stream "^3.1.5"
@@ -12079,22 +12468,22 @@ tar-fs@^3.0.6:
     bare-fs "^4.0.1"
     bare-path "^3.0.0"
 
-tar-fs@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz#e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"
-  integrity sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==
+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.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"
   integrity sha512-9uqP2hJUZNKRkwPDe5nXxXdzo6w+BFBPq9x/tyi5/U/DneuSesO/HMb0y5TeWpfcv49YDJTs7SrrZeeu8ZHWDA==
 
-tar-stream@^2.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==
@@ -12114,17 +12503,17 @@ tar-stream@^3.0.0, tar-stream@^3.1.5:
     fast-fifo "^1.2.0"
     streamx "^2.15.0"
 
-temporal-polyfill@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz#0796c40a50754c69ec0f9a2db3f6c582b9721aaf"
-  integrity sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==
+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.2.4"
+    temporal-spec "0.3.0"
 
-temporal-spec@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/temporal-spec/-/temporal-spec-0.2.4.tgz#7eb10447a62429ffaaa80b42b869b138ae306a75"
-  integrity sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==
+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==
 
 terser-webpack-plugin@^5.3.11, terser-webpack-plugin@^5.3.9:
   version "5.3.14"
@@ -12148,12 +12537,12 @@ terser@^5.10.0:
     source-map-support "~0.5.20"
 
 terser@^5.31.1:
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.39.0.tgz#0e82033ed57b3ddf1f96708d123cca717d86ca3a"
-  integrity sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==
+  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.8.2"
+    acorn "^8.14.0"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -12166,26 +12555,26 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-testcontainers@10.21.0, testcontainers@^10.18.0, testcontainers@^10.19.0, testcontainers@^10.20.0:
-  version "10.21.0"
-  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-10.21.0.tgz#ee1973d9f783984853965da22035b58627253b81"
-  integrity sha512-avzqNfP0HyHaOPTztHbGnHycZWzWaeUwSPnJGCYin2LB+n/tlGjAzExVrkIaCSBwIjFkMlufEYuKWzGc8mupDQ==
+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==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
-    "@types/dockerode" "^3.3.29"
+    "@types/dockerode" "^3.3.39"
     archiver "^7.0.1"
     async-lock "^1.4.1"
     byline "^5.0.0"
-    debug "^4.3.5"
-    docker-compose "^0.24.8"
-    dockerode "^3.3.5"
-    get-port "^5.1.1"
+    debug "^4.4.1"
+    docker-compose "^1.2.0"
+    dockerode "^4.0.6"
+    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.6"
+    tar-fs "^3.0.9"
     tmp "^0.2.3"
-    undici "^5.28.5"
+    undici "^7.10.0"
 
 text-decoder@^1.1.0:
   version "1.2.3"
@@ -12320,10 +12709,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-api-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd"
-  integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==
+ts-api-utils@^2.0.1, 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-node@^10.9.1:
   version "10.9.2"
@@ -12354,12 +12743,12 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0:
+tslib@^2.0.0, 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==
 
-tslib@^2.4.0, tslib@^2.6.1, tslib@^2.6.2, tslib@^2.7.0:
+tslib@^2.6.1, tslib@^2.6.2, tslib@^2.7.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.0.tgz#d124c86c3c05a40a91e6fdea4021bd31d377971b"
   integrity sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==
@@ -12401,6 +12790,15 @@ 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:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.1.tgz#64f6cf03f92fce4015c2b224793f6bdd4b068c97"
+  integrity sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==
+  dependencies:
+    content-type "^1.0.5"
+    media-typer "^1.1.0"
+    mime-types "^3.0.0"
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -12454,10 +12852,10 @@ typed-array-length@^1.0.7:
     possible-typed-array-names "^1.0.0"
     reflect.getprototypeof "^1.0.6"
 
-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.8.3:
+  version "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:
   version "1.0.40"
@@ -12489,17 +12887,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.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
-  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
+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@^5.28.5:
-  version "5.28.5"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.5.tgz#b2b94b6bf8f1d919bc5a6f31f2c01deb02e54d4b"
-  integrity sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==
-  dependencies:
-    "@fastify/busboy" "^2.0.0"
+undici@^7.10.0:
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.10.0.tgz#8ae17a976acc6593b13c9ff3342840bea9b24670"
+  integrity sha512-u5otvFBOBZvmdjWLVW+5DAc9Nkq8f24g0O9oY7qw2JVIF1VocIFoyz9JFkuVOS2j41AufeO0xnlweJ2RLT8nGw==
 
 unhomoglyph@^1.0.6:
   version "1.0.6"
@@ -12554,7 +12950,7 @@ unplugin@1.0.1:
     webpack-sources "^3.2.3"
     webpack-virtual-modules "^0.5.0"
 
-update-browserslist-db@^1.1.1:
+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==
@@ -12645,6 +13041,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+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@^9.0.0:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
@@ -12672,7 +13073,7 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-vary@~1.1.2:
+vary@^1.1.2, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
@@ -12700,6 +13101,11 @@ w3c-xmlserializer@^4.0.0:
   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==
+
 walk@^2.3.15:
   version "2.3.15"
   resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.15.tgz#1b4611e959d656426bc521e2da5db3acecae2424"
@@ -12715,9 +13121,9 @@ walker@^1.0.8:
     makeerror "1.0.12"
 
 watchpack@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
-  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.4.tgz#473bda72f0850453da6425081ea46fc0d7602947"
+  integrity sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -12729,22 +13135,15 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-wcwidth@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
-  dependencies:
-    defaults "^1.0.3"
-
 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==
 
-web-vitals@^4.0.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.3.tgz#270c4baecfbc6ec6fc15da1989e465e5f9b94fb7"
-  integrity sha512-/CFAm1mNxSmOj6i0Co+iGFJ58OS4NRGVP+AWS/l509uIK5a1bSoIVaHz/ZumpHTfHSZBpgrJ+wjfpAOrTHok5Q==
+web-vitals@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-4.2.4.tgz#1d20bc8590a37769bd0902b289550936069184b7"
+  integrity sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==
 
 webcrypto-core@^1.8.0:
   version "1.8.1"
@@ -12822,13 +13221,14 @@ webpack-dev-middleware@^7.4.2:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.0.tgz#68043886edaa3fd875ad20e01589990a79612f9c"
-  integrity sha512-90SqqYXA2SK36KcT6o1bvwvZfJFcmoamqeJY7+boioffX9g9C0wjjJRGUrQIuh43pb0ttX7+ssavmj/WN2RHtA==
+  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==
   dependencies:
     "@types/bonjour" "^3.5.13"
     "@types/connect-history-api-fallback" "^1.5.4"
     "@types/express" "^4.17.21"
+    "@types/express-serve-static-core" "^4.17.21"
     "@types/serve-index" "^1.9.4"
     "@types/serve-static" "^1.15.5"
     "@types/sockjs" "^0.3.36"
@@ -12871,9 +13271,9 @@ webpack-retry-chunk-load-plugin@^3.1.1:
     prettier "^2.6.2"
 
 webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+  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-version-file-plugin@^0.5.0:
   version "0.5.0"
@@ -12890,12 +13290,13 @@ webpack-virtual-modules@^0.5.0:
   integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==
 
 webpack@^5.89.0:
-  version "5.98.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.98.0.tgz#44ae19a8f2ba97537978246072fb89d10d1fbd17"
-  integrity sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==
+  version "5.99.9"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.99.9.tgz#d7de799ec17d0cce3c83b70744b4aedb537d8247"
+  integrity sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==
   dependencies:
     "@types/eslint-scope" "^3.7.7"
     "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
     "@webassemblyjs/ast" "^1.14.1"
     "@webassemblyjs/wasm-edit" "^1.14.1"
     "@webassemblyjs/wasm-parser" "^1.14.1"
@@ -12912,7 +13313,7 @@ webpack@^5.89.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^4.3.0"
+    schema-utils "^4.3.2"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.3.11"
     watchpack "^2.4.1"
@@ -13117,11 +13518,16 @@ 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, ws@^8.18.0:
+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==
+
 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"
@@ -13159,10 +13565,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:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98"
-  integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==
+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==
 
 yargs-parser@^18.1.2:
   version "18.1.3"
@@ -13227,11 +13633,11 @@ zip-stream@^6.0.1:
     readable-stream "^4.0.0"
 
 zod-validation-error@^3.0.3:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-3.4.0.tgz#3a8a1f55c65579822d7faa190b51336c61bee2a6"
-  integrity sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==
+  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==
 
 zod@^3.22.4:
-  version "3.24.2"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.2.tgz#8efa74126287c675e92f46871cfc8d15c34372b3"
-  integrity sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==
+  version "3.25.36"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.36.tgz#e5ae0fb7803662b8a21d9a1e282e7d5b8ff57726"
+  integrity sha512-eRFS3i8T0IrpGdL8HQyqFAugGOn7jOjyGgGdtv5NY4Wkhi7lJDk732bNZ609YMIGFbLoaj6J69O1Mura23gfIw==